4 files changed, 1 insertions, 14 deletions
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;