unifdef WORD64

Remove leftover remnants of CRAY support, which still had some
functions consisting solely of /* NOT IMPLEMENTED YET */ comments.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

3 files changed, 0 insertions, 156 deletions

diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h
index 8ca3e5f..800f10b 100644
--- a/include/X11/ICE/ICEmsg.h
+++ b/include/X11/ICE/ICEmsg.h
@@ -186,20 +186,12 @@ extern IcePaAuthStatus _IcePaMagicCookie1Proc (
     } \
 }
 
-#ifndef WORD64
-
 #define IceWriteData16(_iceConn, _bytes, _data) \
     IceWriteData (_iceConn, _bytes, (char *) _data)
 
 #define IceWriteData32(_iceConn, _bytes, _data) \
     IceWriteData (_iceConn, _bytes, (char *) _data)
 
-#else /* WORD64 */
-
-/* IceWriteData16 and IceWriteData32 defined in misc.c for WORD64 */
-
-#endif /* WORD64 */
-
 
 /*
  * The IceSendData macro bypasses copying the data to the
@@ -281,8 +273,6 @@ extern IcePaAuthStatus _IcePaMagicCookie1Proc (
 #define IceReadData(_iceConn, _bytes, _pData) \
     _IceRead (_iceConn, (unsigned long) (_bytes), (char *) _pData); \
 
-#ifndef WORD64
-
 #define IceReadData16(_iceConn, _swap, _bytes, _pData) \
 { \
     _IceRead (_iceConn, (unsigned long) (_bytes), (char *) _pData); \
@@ -293,12 +283,6 @@ extern IcePaAuthStatus _IcePaMagicCookie1Proc (
     _IceRead (_iceConn, (unsigned long) (_bytes), (char *) _pData); \
 }
 
-#else /* WORD64 */
-
-/* IceReadData16 and IceReadData32 defined in misc.c for WORD64 */
-
-#endif /* WORD64 */
-
 
 /*
  * Read pad bytes (for 32 or 64 bit alignment).
diff --git a/src/ICElibint.h b/src/ICElibint.h
index 0638fb0..240e295 100644
--- a/src/ICElibint.h
+++ b/src/ICElibint.h
@@ -155,8 +155,6 @@ typedef struct {
     _pBuf += 1; \
 }
 
-#ifndef WORD64
-
 #define STORE_CARD16(_pBuf, _val) \
 { \
     *((CARD16 *) _pBuf) = _val; \
@@ -169,30 +167,6 @@ typedef struct {
     _pBuf += 4; \
 }
 
-#else /* WORD64 */
-
-#define STORE_CARD16(_pBuf, _val) \
-{ \
-    struct { \
-        int value   :16; \
-        int pad     :16; \
-    } _d; \
-    _d.value = _val; \
-    memcpy (_pBuf, &_d, 2); \
-    _pBuf += 2; \
-}
-
-#define STORE_CARD32(_pBuf, _val) \
-{ \
-    struct { \
-        int value   :32; \
-    } _d; \
-    _d.value = _val; \
-    memcpy (_pBuf, &_d, 4); \
-    _pBuf += 4; \
-}
-
-#endif /* WORD64 */
 
 #define STORE_STRING(_pBuf, _string) \
 { \
@@ -215,8 +189,6 @@ typedef struct {
     _pBuf += 1; \
 }
 
-#ifndef WORD64
-
 #define EXTRACT_CARD16(_pBuf, _swap, _val) \
 { \
     _val = *((CARD16 *) _pBuf); \
@@ -233,33 +205,6 @@ typedef struct {
         _val = lswapl (_val); \
 }
 
-#else /* WORD64 */
-
-#define EXTRACT_CARD16(_pBuf, _swap, _val) \
-{ \
-    _val = *(_pBuf + 0) & 0xff; 	/* 0xff incase _pBuf is signed */ \
-    _val <<= 8; \
-    _val |= *(_pBuf + 1) & 0xff;\
-    _pBuf += 2; \
-    if (_swap) \
-        _val = lswaps (_val); \
-}
-
-#define EXTRACT_CARD32(_pBuf, _swap, _val) \
-{ \
-    _val = *(_pBuf + 0) & 0xff; 	/* 0xff incase _pBuf is signed */ \
-    _val <<= 8; \
-    _val |= *(_pBuf + 1) & 0xff;\
-    _val <<= 8; \
-    _val |= *(_pBuf + 2) & 0xff;\
-    _val <<= 8; \
-    _val |= *(_pBuf + 3) & 0xff;\
-    _pBuf += 4; \
-    if (_swap) \
-        _val = lswapl (_val); \
-}
-
-#endif /* WORD64 */
 
 #define EXTRACT_STRING(_pBuf, _swap, _string) \
 { \
diff --git a/src/misc.c b/src/misc.c
index e201fda..d182ebd 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -406,91 +406,6 @@ _IceWrite (
     }
 }
 
-#ifdef WORD64
-
-IceWriteData16 (
-	IceConn 	iceConn,
-	unsigned long 	nbytes,
-	short  		*data
-)
-{
-    int numShorts = nbytes / 2;
-    int index = 0;
-
-    while (index < numShorts)
-    {
-	int spaceLeft, count, i;
-	int shortsLeft = numShorts - index;
-
-	spaceLeft = iceConn->outbufmax - iceConn->outbufptr - 1;
-
-	if (spaceLeft < 2)
-	{
-	    IceFlush (iceConn);
-	    spaceLeft = iceConn->outbufmax - iceConn->outbufptr - 1;
-	}
-
-	count = (shortsLeft < spaceLeft / 2) ? shortsLeft : spaceLeft / 2;
-
-	for (i = 0; i < count; i++)
-	    STORE_CARD16 (iceConn->outbufptr, data[index++]);
-    }
-}
-
-
-IceWriteData32 (
-	IceConn 	iceConn,
-	unsigned long  	nbytes,
-	int	 	*data
-)
-{
-    int numLongs = nbytes / 4;
-    int index = 0;
-
-    while (index < numLongs)
-    {
-	int spaceLeft, count, i;
-	int longsLeft = numLongs - index;
-
-	spaceLeft = iceConn->outbufmax - iceConn->outbufptr - 1;
-
-	if (spaceLeft < 4)
-	{
-	    IceFlush (iceConn);
-	    spaceLeft = iceConn->outbufmax - iceConn->outbufptr - 1;
-	}
-
-	count = (longsLeft < spaceLeft / 4) ? longsLeft : spaceLeft / 4;
-
-	for (i = 0; i < count; i++)
-	    STORE_CARD32 (iceConn->outbufptr, data[index++]);
-    }
-}
-
-
-IceReadData16 (
-	IceConn 	iceConn,
-	Bool		swap,
-	unsigned long 	nbytes,
-	short  		*data
-)
-{
-    /* NOT IMPLEMENTED YET */
-}
-
-
-IceReadData32 (
-	IceConn 	iceConn,
-	Bool		swap,
-	unsigned long  	nbytes,
-	int	 	*data
-)
-{
-    /* NOT IMPLEMENTED YET */
-}
-
-#endif  /* WORD64 */
-
 
 
 void