[PATCH 11/21] xfree86: Undef __HIGHC__
MetaWare High C++ compiler? xfree86 cvs history shows this being added in a commit whose text is, classically, "updates". metaware.com redirects to a 404 on synopsys.com, which to me indicates it's not super important to them, and their order form won't even tell you how much the thing costs. At any rate if this is worth worrying about it's worth letting autoconf worry about for us. Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson --- hw/xfree86/common/compiler.h | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 2794f44..0b2f98a 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -79,8 +79,6 @@ #ifndef __inline__ #if defined(__GNUC__) /* gcc has __inline__ */ -#elif defined(__HIGHC__) -#define __inline__ _Inline #else #define __inline__ /**/ #endif @@ -88,8 +86,6 @@ #ifndef __inline #if defined(__GNUC__) /* gcc has __inline */ -#elif defined(__HIGHC__) -#define __inline _Inline #else #define __inline /**/ #endif @@ -1235,8 +1231,7 @@ inl(unsigned short port) #if !defined(__SUNPRO_C) #include #endif -#if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \ - defined(__USLC__) +#if !defined(__SUNPRO_C) || defined(__USLC__) #pragma asm partial_optimization outl #pragma asm partial_optimization outw #pragma asm partial_optimization outb -- 1.9.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH 11/21] xfree86: Undef __HIGHC__
MetaWare High C++ compiler? xfree86 cvs history shows this being added in a commit whose text is, classically, "updates". metaware.com redirects to a 404 on synopsys.com, which to me indicates it's not super important to them, and their order form won't even tell you how much the thing costs. At any rate if this is worth worrying about it's worth letting autoconf worry about for us. Signed-off-by: Adam Jackson --- hw/xfree86/common/compiler.h | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 0d5d532..dc69f77 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -79,8 +79,6 @@ #ifndef __inline__ #if defined(__GNUC__) /* gcc has __inline__ */ -#elif defined(__HIGHC__) -#define __inline__ _Inline #else #define __inline__ /**/ #endif @@ -88,8 +86,6 @@ #ifndef __inline #if defined(__GNUC__) /* gcc has __inline */ -#elif defined(__HIGHC__) -#define __inline _Inline #else #define __inline /**/ #endif @@ -1232,8 +1228,7 @@ inl(unsigned short port) #if !defined(__SUNPRO_C) #include #endif -#if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \ - defined(__USLC__) +#if !defined(__SUNPRO_C) || defined(__USLC__) #pragma asm partial_optimization outl #pragma asm partial_optimization outw #pragma asm partial_optimization outb -- 1.9.0 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
