summaryrefslogtreecommitdiff
path: root/Xmd.h
diff options
context:
space:
mode:
Diffstat (limited to 'Xmd.h')
-rw-r--r--Xmd.h18
1 files changed, 14 insertions, 4 deletions
diff --git a/Xmd.h b/Xmd.h
index 4623166..377b9bc 100644
--- a/Xmd.h
+++ b/Xmd.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/include/Xmd.h,v 3.16 2002/05/31 18:45:39 dawes Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -57,7 +58,12 @@ SOFTWARE.
#ifdef CRAY
#define WORD64 /* 64-bit architecture */
#endif
-#ifdef __alpha
+#if defined(__alpha) || defined(__alpha__) || \
+ defined(__ia64__) || defined(ia64) || \
+ defined(__sparc64__) || \
+ defined(__s390x__) || \
+ (defined(__hppa__) && defined(__LP64__)) || \
+ defined(__x86_64__) || defined(x86_64)
#define LONG64 /* 32/64-bit architecture */
#endif
#ifdef __sgi
@@ -147,10 +153,14 @@ typedef unsigned char CARD8;
typedef CARD32 BITS32;
typedef CARD16 BITS16;
-typedef CARD8 BYTE;
-
-typedef CARD8 BOOL;
+#ifndef I_NEED_OS2_H
+typedef CARD8 BYTE;
+typedef CARD8 BOOL;
+#else
+#define BYTE CARD8
+#define BOOL CARD8
+#endif
/*
* definitions for sign-extending bitfields on 64-bit architectures