[PATCH:libX11 3/3] unifdef CRAY & _CRAY

[Alan Coopersmith]

(mostly performed with unifdef, followed by some manual cleanup of
 the remaining code)

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 include/X11/Xlib.h    |    4 ----
 include/X11/Xlibint.h |    7 -------
 src/xcms/cmsTrig.c    |    4 ----
 3 files changed, 15 deletions(-)

diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
index 9618081..65f253c 100644
--- a/include/X11/Xlib.h
+++ b/include/X11/Xlib.h
@@ -128,11 +128,7 @@ typedef char *XPointer;
 #define BitmapBitOrder(dpy) 	(((_XPrivDisplay)dpy)->bitmap_bit_order)
 #define BitmapPad(dpy) 		(((_XPrivDisplay)dpy)->bitmap_pad)
 #define ImageByteOrder(dpy) 	(((_XPrivDisplay)dpy)->byte_order)
-#ifdef CRAY /* unable to get WORD64 without pulling in other symbols */
-#define NextRequest(dpy)	XNextRequest(dpy)
-#else
 #define NextRequest(dpy)	(((_XPrivDisplay)dpy)->request + 1)
-#endif
 #define LastKnownRequestProcessed(dpy)	(((_XPrivDisplay)dpy)->last_request_read)
 
 /* macros for screen oriented applications (toolkit) */
diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
index 48323f7..40965c4 100644
--- a/include/X11/Xlibint.h
+++ b/include/X11/Xlibint.h
@@ -209,13 +209,6 @@ struct _XDisplay
 
 #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
 
-/*
- * define the following if you want the Data macro to be a procedure instead
- */
-#ifdef CRAY
-#define DataRoutineIsProcedure
-#endif /* CRAY */
-
 #ifndef _XEVENT_
 /*
  * _QEvent datatype for use in input queueing.
diff --git a/src/xcms/cmsTrig.c b/src/xcms/cmsTrig.c
index 5a01a56..a917b78 100644
--- a/src/xcms/cmsTrig.c
+++ b/src/xcms/cmsTrig.c
@@ -80,12 +80,8 @@ _XcmsModuloF(
 #define XCMS_FABS(x)		((x) < 0.0 ? -(x) : (x))
 
 /* XCMS_DMAXPOWTWO - largest power of two exactly representable as a double */
-#ifdef _CRAY
-#define XCMS_DMAXPOWTWO	((double)(1 < 47))
-#else
 #define XCMS_DMAXPOWTWO	((double)(XCMS_LONG_MAX) * \
 	    (1L << ((XCMS_NBITS(double)-XCMS_DEXPLEN) - XCMS_NBITS(int) + 1)))
-#endif
 
 /*
  *	LOCAL VARIABLES
-- 
1.7.9.2