old-arch cleanup: Drop CRAY support (i.e., drop code related to CRAY, _CRAY, WORD64, WORD64ALIGN, MUSTCOPY, UNSIGNEDBITFIELDS definitions).

8 files changed, 6 insertions, 89 deletions

diff --git a/nx-X11/include/Xmd.h b/nx-X11/include/Xmd.h
index 8c70de94a..78dd895c2 100644
--- a/nx-X11/include/Xmd.h
+++ b/nx-X11/include/Xmd.h
@@ -55,9 +55,6 @@ SOFTWARE.
 /*
  * Special per-machine configuration flags.
  */
-#ifdef CRAY
-#define WORD64				/* 64-bit architecture */
-#endif
 #if defined (_LP64) || \
     defined(__alpha) || defined(__alpha__) || \
     defined(__ia64__) || defined(ia64) || \
@@ -71,15 +68,6 @@ SOFTWARE.
 #endif
 
 /*
- * Stuff to handle large architecture machines; the constants were generated
- * on a 32-bit machine and must coorespond to the protocol.
- */
-#ifdef WORD64
-#define MUSTCOPY
-#endif /* WORD64 */
-
-
-/*
  * Definition of macro used to set constants for size of network structures;
  * machines with preprocessors that can't handle all of the sz_ symbols
  * can define this macro to be sizeof(x) if and only if their compiler doesn't
@@ -105,24 +93,6 @@ SOFTWARE.
  * need them.  Note that bitfields are not guarranteed to be signed
  * (or even unsigned) according to ANSI C.
  */
-#ifdef WORD64
-typedef long INT64;
-typedef unsigned long CARD64;
-#define B32 :32
-#define B16 :16
-#ifdef UNSIGNEDBITFIELDS
-typedef unsigned int INT32;
-typedef unsigned int INT16;
-#else
-#ifdef __STDC__
-typedef signed int INT32;
-typedef signed int INT16;
-#else
-typedef int INT32;
-typedef int INT16;
-#endif
-#endif
-#else
 #define B32
 #define B16
 #ifdef LONG64
@@ -132,7 +102,6 @@ typedef int INT32;
 typedef long INT32;
 #endif
 typedef short INT16;
-#endif
 
 #if defined(__STDC__) || defined(sgi) || defined(AIXV3)
 typedef signed char    INT8;
@@ -163,17 +132,6 @@ typedef CARD8		BOOL;
 /*
  * definitions for sign-extending bitfields on 64-bit architectures
  */
-#if defined(WORD64) && defined(UNSIGNEDBITFIELDS)
-#define cvtINT8toInt(val)   (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val))
-#define cvtINT16toInt(val)  (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val))
-#define cvtINT32toInt(val)  (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (val))
-#define cvtINT8toShort(val)  cvtINT8toInt(val)
-#define cvtINT16toShort(val) cvtINT16toInt(val)
-#define cvtINT32toShort(val) cvtINT32toInt(val)
-#define cvtINT8toLong(val)  cvtINT8toInt(val)
-#define cvtINT16toLong(val) cvtINT16toInt(val)
-#define cvtINT32toLong(val) cvtINT32toInt(val)
-#else
 #define cvtINT8toInt(val) (val)
 #define cvtINT16toInt(val) (val)
 #define cvtINT32toInt(val) (val)
@@ -183,21 +141,12 @@ typedef CARD8		BOOL;
 #define cvtINT8toLong(val) (val)
 #define cvtINT16toLong(val) (val)
 #define cvtINT32toLong(val) (val)
-#endif /* WORD64 and UNSIGNEDBITFIELDS */
 
 
 
-#ifdef MUSTCOPY
-/*
- * This macro must not cast or else pointers will get aligned and be wrong
- */
-#define NEXTPTR(p,t)  (((char *) p) + SIZEOF(t))
-#else /* else not MUSTCOPY, this is used for 32-bit machines */
 /*
- * this version should leave result of type (t *), but that should only be
- * used when not in MUSTCOPY
+ * this version should leave result of type (t *)
  */
 #define NEXTPTR(p,t) (((t *)(p)) + 1)
-#endif /* MUSTCOPY - used machines whose C structs don't line up with proto */
 
 #endif /* XMD_H */
diff --git a/nx-X11/include/Xos.h b/nx-X11/include/Xos.h
index 99cb3bef4..04b14b6fc 100644
--- a/nx-X11/include/Xos.h
+++ b/nx-X11/include/Xos.h
@@ -45,9 +45,6 @@ in this Software without prior written authorization from The Open Group.
 
 #ifdef USG
 #ifndef __TYPES__
-#ifdef CRAY
-#define word word_t
-#endif /* CRAY */
 #include <sys/types.h>			/* forgot to protect it... */
 #define __TYPES__
 #endif /* __TYPES__ */
@@ -149,7 +146,7 @@ extern int sys_nerr;
  */
 #if defined(X_NOT_POSIX)
 #include <fcntl.h>
-#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
+#if defined(USL) || defined(MOTOROLA) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__)
 #include <unistd.h>
 #endif
 #ifdef WIN32
@@ -179,10 +176,7 @@ extern int sys_nerr;
 #include <sys/time.h>
 #endif
 #include <time.h>
-#ifdef CRAY
-#undef word
-#endif /* CRAY */
-#if defined(USG) && !defined(CRAY) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__) && !defined(clipper) && !defined(__clipper__)
+#if defined(USG) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__) && !defined(clipper) && !defined(__clipper__)
 struct timeval {
     long tv_sec;
     long tv_usec;
diff --git a/nx-X11/include/Xpoll.h.in b/nx-X11/include/Xpoll.h.in
index dcea39c60..3200c3711 100644
--- a/nx-X11/include/Xpoll.h.in
+++ b/nx-X11/include/Xpoll.h.in
@@ -81,12 +81,12 @@ from The Open Group.
  * 'the branch below is the fallthrough for halfway modern systems', and include
  * <sys/select.h>, so we get the FD_* macros. */
 #if !defined(DGUX)
-# if (defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE)
+# if (defined(SVR4) || defined(AIXV3)) && !defined(FD_SETSIZE)
 #  include <sys/select.h>
 #  ifdef luna
 #   include <sysent.h>
 #  endif
-# else /* not SVR4/CRAY/AIXv3 */
+# else /* not SVR4/AIXv3 */
 #  if defined(AIXV4) /* AIX 4.2 fubar-ed <sys/select.h>, so try really hard. */
 #   if !defined(NFDBITS)
 #    include <sys/select.h>
diff --git a/nx-X11/include/Xproto.h b/nx-X11/include/Xproto.h
index cb6b79f32..877aab442 100644
--- a/nx-X11/include/Xproto.h
+++ b/nx-X11/include/Xproto.h
@@ -629,13 +629,9 @@ typedef struct _xQueryFontReply {
     CARD16 sequenceNumber B16;
     CARD32 length B32;  /* definitely > 0, even if "nCharInfos" is 0 */
     xCharInfo minBounds; 
-#ifndef WORD64
     CARD32 walign1 B32;
-#endif
     xCharInfo maxBounds; 
-#ifndef WORD64
     CARD32 walign2 B32;
-#endif
     CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
     CARD16 defaultChar B16;
     CARD16 nFontProps B16;  /* followed by this many xFontProp structures */
@@ -678,13 +674,9 @@ typedef struct {
     CARD16 sequenceNumber B16;
     CARD32 length B32;  /* definitely > 0, even if "nameLength" is 0 */
     xCharInfo minBounds; 
-#ifndef WORD64
     CARD32 walign1 B32;
-#endif
     xCharInfo maxBounds; 
-#ifndef WORD64
     CARD32 walign2 B32;
-#endif
     CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
     CARD16 defaultChar B16;
     CARD16 nFontProps B16;  /* followed by this many xFontProp structures */
@@ -1419,12 +1411,7 @@ typedef struct {
     CARD16 length B16;
     Window destination B32;
     CARD32 eventMask B32;
-#ifdef WORD64
-    /* the structure should have been quad-aligned */
-    BYTE eventdata[SIZEOF(xEvent)];
-#else
     xEvent event;
-#endif /* WORD64 */
 } xSendEventReq;
 
 typedef struct {
diff --git a/nx-X11/include/extensions/XKBstr.h b/nx-X11/include/extensions/XKBstr.h
index bc63f4923..6131c931c 100644
--- a/nx-X11/include/extensions/XKBstr.h
+++ b/nx-X11/include/extensions/XKBstr.h
@@ -33,12 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XkbCharToInt(v)		((v)&0x80?(int)((v)|(~0xff)):(int)((v)&0x7f))
 #define	XkbIntTo2Chars(i,h,l)	(((h)=((i>>8)&0xff)),((l)=((i)&0xff)))
 
-#if defined(WORD64) && defined(UNSIGNEDBITFIELDS)
-#define	Xkb2CharsToInt(h,l)	((h)&0x80?(int)(((h)<<8)|(l)|(~0xffff)):\
-					  (int)(((h)<<8)|(l)&0x7fff))
-#else
 #define	Xkb2CharsToInt(h,l)	((short)(((h)<<8)|(l)))
-#endif
 
 	/*
 	 * Common data structures and access macros
diff --git a/nx-X11/include/extensions/lbxopts.h b/nx-X11/include/extensions/lbxopts.h
index 02e87fd26..ac1e12121 100644
--- a/nx-X11/include/extensions/lbxopts.h
+++ b/nx-X11/include/extensions/lbxopts.h
@@ -78,7 +78,7 @@
 
 #include <sys/types.h>
 
-#if defined(WIN32) || (defined(USG) && !defined(CRAY) && !defined(umips) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__))
+#if defined(WIN32) || (defined(USG) && !defined(umips) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__))
 
 struct iovec {
     caddr_t iov_base;
diff --git a/nx-X11/include/extensions/lbxstr.h b/nx-X11/include/extensions/lbxstr.h
index 5b79e361f..a7521b1be 100644
--- a/nx-X11/include/extensions/lbxstr.h
+++ b/nx-X11/include/extensions/lbxstr.h
@@ -377,13 +377,9 @@ typedef struct {
 typedef struct {
     xCharInfo minBounds; 
 /* XXX do we need to leave this gunk? */
-#ifndef WORD64
     CARD32 walign1 B32;
-#endif
     xCharInfo maxBounds; 
-#ifndef WORD64
     CARD32 walign2 B32;
-#endif
     CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
     CARD16 defaultChar B16;
     CARD16 nFontProps B16;  /* followed by this many xFontProp structures */
diff --git a/nx-X11/include/extensions/xf86bigfstr.h b/nx-X11/include/extensions/xf86bigfstr.h
index 7ba199b58..95f107a2a 100644
--- a/nx-X11/include/extensions/xf86bigfstr.h
+++ b/nx-X11/include/extensions/xf86bigfstr.h
@@ -58,13 +58,9 @@ typedef struct {
     CARD16	sequenceNumber B16;
     CARD32	length B32;
     xCharInfo	minBounds;
-#ifndef WORD64
     CARD32	walign1 B32;
-#endif
     xCharInfo	maxBounds;
-#ifndef WORD64
     CARD32	walign2 B32;
-#endif
     CARD16	minCharOrByte2 B16;
     CARD16	maxCharOrByte2 B16;
     CARD16	defaultChar B16;