remove WIN32 _X86_ def

8 files changed, 8 insertions, 16 deletions

diff --git a/xc/lib/X11/Xlibnet.h b/xc/lib/X11/Xlibnet.h
index 8f4a6f315..c6ab1a784 100644
--- a/xc/lib/X11/Xlibnet.h
+++ b/xc/lib/X11/Xlibnet.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Xlibnet.h,v 1.26 93/08/15 13:38:51 rws Exp $ */
+/* $XConsortium: Xlibnet.h,v 1.27 93/08/16 14:12:25 rws Exp $ */
 
 /*
 Copyright 1991 Massachusetts Institute of Technology
@@ -266,7 +266,6 @@ extern Xstream _XsStream[];
 
 #else /* not WIN32 */
 
-#define _X86_ _M_IX86
 #define BOOL wBOOL
 #undef Status
 #define Status wStatus
diff --git a/xc/lib/Xdmcp/Fill.c b/xc/lib/Xdmcp/Fill.c
index 7d60c19ba..d690bcc1f 100644
--- a/xc/lib/Xdmcp/Fill.c
+++ b/xc/lib/Xdmcp/Fill.c
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: Fill.c,v 1.4 91/07/16 20:33:50 gildea Exp $
+ * $XConsortium: Fill.c,v 1.5 93/08/17 15:34:53 rws Exp $
  *
  * Copyright 1989 Massachusetts Institute of Technology
  *
@@ -27,7 +27,6 @@
 #include <tiuser.h>
 #else
 #ifdef WIN32
-#define _X86_ _M_IX86
 #define BOOL wBOOL
 #include <winsock.h>
 #undef BOOL
diff --git a/xc/lib/Xdmcp/Flush.c b/xc/lib/Xdmcp/Flush.c
index 5a6269cdf..1736869ce 100644
--- a/xc/lib/Xdmcp/Flush.c
+++ b/xc/lib/Xdmcp/Flush.c
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: Flush.c,v 1.4 91/07/16 20:33:52 gildea Exp $
+ * $XConsortium: Flush.c,v 1.5 93/08/17 15:35:40 rws Exp $
  *
  * Copyright 1989 Massachusetts Institute of Technology
  *
@@ -27,7 +27,6 @@
 #include <tiuser.h>
 #else
 #ifdef WIN32
-#define _X86_ _M_IX86
 #define BOOL wBOOL
 #include <winsock.h>
 #undef BOOL
diff --git a/xc/lib/Xmu/CvtStdSel.c b/xc/lib/Xmu/CvtStdSel.c
index 0e550b133..580e7090b 100644
--- a/xc/lib/Xmu/CvtStdSel.c
+++ b/xc/lib/Xmu/CvtStdSel.c
@@ -1,4 +1,4 @@
-/* $XConsortium: CvtStdSel.c,v 1.24 93/08/16 14:27:24 rws Exp $
+/* $XConsortium: CvtStdSel.c,v 1.25 93/08/16 14:34:45 rws Exp $
  *
  * Copyright 1988 by the Massachusetts Institute of Technology
  *
@@ -41,7 +41,6 @@
 
 #ifndef SYSVNET
 #ifdef WIN32
-#define _X86_ _M_IX86
 #define BOOL wBOOL
 #undef Status
 #define Status wStatus
diff --git a/xc/lib/Xmu/GetHost.c b/xc/lib/Xmu/GetHost.c
index 959b12924..7333efbb2 100644
--- a/xc/lib/Xmu/GetHost.c
+++ b/xc/lib/Xmu/GetHost.c
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: GetHost.c,v 1.2 90/12/14 19:24:38 converse Exp $
+ * $XConsortium: GetHost.c,v 1.3 93/08/16 14:11:21 rws Exp $
  *
  * Copyright 1989 Massachusetts Institute of Technology
  *
@@ -26,7 +26,6 @@
  */
 
 #ifdef WIN32
-#define _X86_ _M_IX86
 #include <winsock.h>
 #endif
 
diff --git a/xc/lib/Xt/fd.h b/xc/lib/Xt/fd.h
index 0b80fdda4..812ec6b99 100644
--- a/xc/lib/Xt/fd.h
+++ b/xc/lib/Xt/fd.h
@@ -1,5 +1,5 @@
 /*
-* $XConsortium: fd.h,v 1.15 93/07/08 13:29:55 kaleb Exp $
+* $XConsortium: fd.h,v 1.16 93/08/17 17:27:06 rws Exp $
 * $oHeader: fd.h,v 1.4 88/08/26 14:49:54 asente Exp $
 */
 
@@ -35,7 +35,6 @@ SOFTWARE.
 #ifndef	FD_SETSIZE
 #define	FD_SETSIZE	256
 #endif
-#define _X86_ _M_IX86
 #define BOOL wBOOL
 #undef Status
 #define Status wStatus
diff --git a/xc/programs/xauth/gethost.c b/xc/programs/xauth/gethost.c
index d99216e16..37b28800f 100644
--- a/xc/programs/xauth/gethost.c
+++ b/xc/programs/xauth/gethost.c
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: gethost.c,v 1.15 93/08/16 13:55:56 rws Exp $
+ * $XConsortium: gethost.c,v 1.16 93/08/16 14:11:52 rws Exp $
  *
  * Copyright 1989 Massachusetts Institute of Technology
  *
@@ -30,7 +30,6 @@
 #endif
 
 #ifdef WIN32
-#define _X86_ _M_IX86
 #include <winsock.h>
 #define EPROTOTYPE WSAEPROTOTYPE
 #endif
diff --git a/xc/unsupported/programs/xbiff/Mailbox.c b/xc/unsupported/programs/xbiff/Mailbox.c
index fcf77bd77..01d1a1e17 100644
--- a/xc/unsupported/programs/xbiff/Mailbox.c
+++ b/xc/unsupported/programs/xbiff/Mailbox.c
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: Mailbox.c,v 1.59 91/10/16 21:36:10 eswu Exp $
+ * $XConsortium: Mailbox.c,v 1.60 93/08/17 18:02:18 rws Exp $
  *
  * Copyright 1988 Massachusetts Institute of Technology
  *
@@ -27,7 +27,6 @@
 #include <X11/cursorfont.h>		/* for cursor constants */
 #include <X11/Xosdefs.h>		/* for X_NOT_POSIX def */
 #ifdef WIN32
-#define _X86_ _M_IX86
 #include <stdlib.h>
 #include <X11/Xw32defs.h>
 #else