aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/include/Xmd.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-15 09:58:01 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-16 14:09:07 +0200
commitbad67799229b94ea2ba0174319949766ad1c2fc6 (patch)
tree3a698e5e7544952aefe5cf927a685c76759a8088 /nx-X11/include/Xmd.h
parent097562b8bbc04d421e0ab5e1e7a0b705e393c20e (diff)
downloadnx-libs-bad67799229b94ea2ba0174319949766ad1c2fc6.tar.gz
nx-libs-bad67799229b94ea2ba0174319949766ad1c2fc6.tar.bz2
nx-libs-bad67799229b94ea2ba0174319949766ad1c2fc6.zip
old-arch cleanup: Drop CRAY support (i.e., drop code related to CRAY, _CRAY, WORD64, WORD64ALIGN, MUSTCOPY, UNSIGNEDBITFIELDS definitions).
Diffstat (limited to 'nx-X11/include/Xmd.h')
-rw-r--r--nx-X11/include/Xmd.h53
1 files changed, 1 insertions, 52 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 */