diff options
Diffstat (limited to 'hw/xfree86/common')
| -rw-r--r-- | hw/xfree86/common/compiler.h | 14 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Configure.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86str.h | 2 |
5 files changed, 11 insertions, 11 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__) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index c2b522a18..fa04a3f11 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -868,7 +868,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) /* when forcing input devices, we use kbd. otherwise evdev, so use the * evdev rules set. */ -#if defined(linux) +#if defined(__linux__) if (!xf86Info.forceInputDevices) rules = "evdev"; else diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 668a55151..5f9643a52 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -61,7 +61,7 @@ static Bool foundMouse = FALSE; #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) static const char *DFLT_MOUSE_DEV = "/dev/sysmouse"; static const char *DFLT_MOUSE_PROTO = "auto"; -#elif defined(linux) +#elif defined(__linux__) static const char *DFLT_MOUSE_DEV = "/dev/input/mice"; static const char *DFLT_MOUSE_PROTO = "auto"; #elif defined(WSCONS_SUPPORT) diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index d0bd6e95b..994b63b43 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -183,7 +183,7 @@ xf86PrintBanner(void) xf86ErrorFVerb(0, "Current Operating System: %s %s %s %s %s\n", name.sysname, name.nodename, name.release, name.version, name.machine); -#ifdef linux +#ifdef __linux__ do { char buf[80]; int fd = open("/proc/cmdline", O_RDONLY); diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index 1da66e2dd..edd91c745 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -249,7 +249,7 @@ typedef struct _DriverRec { */ /* Tolerate prior #include <linux/input.h> */ -#if defined(linux) +#if defined(__linux__) #undef BUS_NONE #undef BUS_PCI #undef BUS_SBUS |