diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-02-14 14:10:21 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-02-14 14:10:21 -0800 |
| commit | e7094ceaf95a15eae73819d0ffdb9b982075e0d2 (patch) | |
| tree | 8a55b23a9cb33aebafc10ba354159cd6ab91b8df /include | |
| parent | 33a6d9dc30188c02a3ec703153728b31d458ec1e (diff) | |
unifdef -UCRAY -UCRAY2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/Intrinsic.h | 10 | ||||
| -rw-r--r-- | include/X11/Xtos.h | 3 |
2 files changed, 0 insertions, 13 deletions
diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h index d09acad..794b820 100644 --- a/include/X11/Intrinsic.h +++ b/include/X11/Intrinsic.h @@ -147,15 +147,9 @@ typedef int XtCacheType; * ArgLists rely heavily on the above typedef. * ****************************************************************/ -#ifdef CRAY -typedef long Boolean; -typedef char* XtArgVal; -typedef long XtEnum; -#else typedef char Boolean; typedef long XtArgVal; typedef unsigned char XtEnum; -#endif typedef unsigned int Cardinal; typedef unsigned short Dimension; /* Size in pixels */ @@ -1663,12 +1657,8 @@ extern void XtGetConstraintResourceList( #define XtDefaultFont "XtDefaultFont" #define XtDefaultFontSet "XtDefaultFontSet" -#if defined(CRAY) -#define XtOffset(p_type,field) _Offsetof(p_type,field) -#else /* ! CRAY */ #define XtOffset(p_type,field) \ ((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL))) -#endif /* !CRAY */ #ifdef offsetof #define XtOffsetOf(s_type,field) offsetof(s_type,field) diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h index 7079321..64b2da8 100644 --- a/include/X11/Xtos.h +++ b/include/X11/Xtos.h @@ -52,9 +52,6 @@ SOFTWARE. #define DEALLOCATE_LOCAL_FALLBACK(_ptr) XtFree((XtPointer)(_ptr)) #include <X11/Xalloca.h> -#ifdef CRAY -#define WORD64 -#endif #if defined (_LP64) || \ defined(__alpha) || defined(__alpha__) || \ |