diff options
| author | Julien Cristau <jcristau@debian.org> | 2017-05-11 08:42:16 +0200 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-05-11 15:24:05 -0400 |
| commit | c394f6b27329d212d2a8b9b3c6da1ef7847c46f3 (patch) | |
| tree | 624163a80541895a1910541711400f7f8f9808a5 /hw/xfree86/common/compiler.h | |
| parent | 6634ffc4d26846dcf892f27682f9021f6d9956a9 (diff) | |
Replace all checks for 'linux' macro with '__linux__'
gcc -std=c99 does not define the former, and it's a horrible namespace
confusion anyway.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'hw/xfree86/common/compiler.h')
| -rw-r--r-- | hw/xfree86/common/compiler.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 5a1fdac96..eea29dfb5 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -98,9 +98,9 @@ #if defined(DO_PROTOTYPES) #if !defined(__arm__) #if !defined(__sparc__) && !defined(__arm32__) && !defined(__nds32__) \ - && !(defined(__alpha__) && defined(linux)) \ - && !(defined(__ia64__) && defined(linux)) \ - && !(defined(__mips64) && defined(linux)) \ + && !(defined(__alpha__) && defined(__linux__)) \ + && !(defined(__ia64__) && defined(__linux__)) \ + && !(defined(__mips64) && defined(__linux__)) \ extern _X_EXPORT void outb(unsigned short, unsigned char); extern _X_EXPORT void outw(unsigned short, unsigned short); @@ -215,7 +215,7 @@ extern _X_EXPORT void xf86WriteMmio32Le (void *, unsigned long, unsigned int); #ifdef __GNUC__ #if defined(__alpha__) -#ifdef linux +#ifdef __linux__ /* for Linux on Alpha, we use the LIBC _inx/_outx routines */ /* note that the appropriate setup via "ioperm" needs to be done */ /* *before* any inx/outx is done. */ @@ -263,7 +263,7 @@ inl(unsigned long port) return _inl(port); } -#endif /* linux */ +#endif /* __linux__ */ #if (defined(__FreeBSD__) || defined(__OpenBSD__)) \ && !defined(DO_PROTOTYPES) @@ -570,7 +570,7 @@ inl(unsigned PORT_SIZE port) } #if defined(__mips__) -#ifdef linux /* don't mess with other OSs */ +#ifdef __linux__ /* don't mess with other OSs */ #if X_BYTE_ORDER == X_BIG_ENDIAN static __inline__ unsigned int xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset) @@ -594,7 +594,7 @@ xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset, :"r"(val), "r"(addr)); } #endif -#endif /* !linux */ +#endif /* !__linux__ */ #endif /* __mips__ */ #elif defined(__powerpc__) |