summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorBen Byer <bbyer@bbyer.local>2007-10-14 18:07:03 -0700
committerBen Byer <bbyer@bbyer.local>2007-10-14 18:07:03 -0700
commit3d4eb17b38dcb1468493f3686dc5ea3623ef9a73 (patch)
tree8513b52c480f7e2fd8821d959a097c95ec67676c /os
parentec0fc012e91e703bb399a380df2912f71957a220 (diff)
mass change from #ifdef i386 to #ifdef __i386__ to conform to ANSI
Diffstat (limited to 'os')
-rw-r--r--os/access.c4
-rw-r--r--os/io.c2
-rw-r--r--os/xalloc.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/os/access.c b/os/access.c
index 5b638c70e..b0f63edc2 100644
--- a/os/access.c
+++ b/os/access.c
@@ -119,10 +119,10 @@ SOFTWARE.
# include <net/if.h>
# endif
#else
-#if defined(SVR4) || (defined(SYSV) && defined(i386)) || defined(__GNU__)
+#if defined(SVR4) || (defined(SYSV) && defined(__i386__)) || defined(__GNU__)
# include <sys/utsname.h>
#endif
-#if defined(SYSV) && defined(i386)
+#if defined(SYSV) && defined(__i386__)
# include <sys/stream.h>
# ifdef ISC
# include <sys/stropts.h>
diff --git a/os/io.c b/os/io.c
index 9de75eeaa..36abe1332 100644
--- a/os/io.c
+++ b/os/io.c
@@ -356,7 +356,7 @@ ReadRequestFromClient(ClientPtr client)
{
if ((result < 0) && ETEST(errno))
{
-#if defined(SVR4) && defined(i386) && !defined(sun)
+#if defined(SVR4) && defined(__i386__) && !defined(sun)
if (0)
#endif
{
diff --git a/os/xalloc.c b/os/xalloc.c
index 8c019f3bc..e5f39465b 100644
--- a/os/xalloc.c
+++ b/os/xalloc.c
@@ -211,7 +211,7 @@ extern Bool Must_have_memory;
fclose(f); \
} \
}
-#if defined(linux) && defined(i386)
+#if defined(linux) && defined(__i386__)
#define LOG_ALLOC(_fun, _size, _ret) \
{ unsigned long *from; \
__asm__("movl %%ebp,%0" : /*OUT*/ "=r" (from) : /*IN*/ ); \