diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
| commit | a6bdd56c5b098599942e4091ae7e2af2d4631b44 (patch) | |
| tree | e0a23167aca0fb1127f4cd78edf458b633b31eac /include/X11/Intrinsic.h | |
| parent | 6a13c9e08bb042c81ae904c44a38a50d785c824e (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'include/X11/Intrinsic.h')
| -rw-r--r-- | include/X11/Intrinsic.h | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h index bae18eb..3d41150 100644 --- a/include/X11/Intrinsic.h +++ b/include/X11/Intrinsic.h @@ -48,6 +48,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.8 2001/12/14 19:56:22 dawes Exp $ */ #ifndef _XtIntrinsic_h #define _XtIntrinsic_h @@ -60,15 +61,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xos.h> /* for R4 compatibility */ #else #include <X11/Xosdefs.h> -#ifndef X_NOT_STDC_ENV #include <string.h> /* for XtNewString */ -#else -#ifdef SYSV -#include <string.h> -#else -#include <strings.h> -#endif /* SYSV else */ -#endif /* !X_NOT_STDC_ENV else */ #endif /* XT_BC else */ #define XtSpecificationRelease 6 @@ -101,9 +94,7 @@ typedef char *String; #endif /* NeedFunctionPrototypes */ -#ifndef NULL -#define NULL 0 -#endif +#include <stddef.h> #ifdef VMS #define externalref globalref @@ -750,13 +741,8 @@ extern void XtDisplayStringConversionWarning( #endif ); -#ifdef __STDC__ externalref XtConvertArgRec const colorConvertArgs[]; externalref XtConvertArgRec const screenConvertArg[]; -#else -externalref XtConvertArgRec colorConvertArgs[]; -externalref XtConvertArgRec screenConvertArg[]; -#endif extern void XtAppAddConverter( /* obsolete */ #if NeedFunctionPrototypes @@ -2057,25 +2043,11 @@ extern void XtGetConstraintResourceList( #define XtDefaultFont "XtDefaultFont" #define XtDefaultFontSet "XtDefaultFontSet" -#if defined(CRAY) || defined(__arm) -#if __STDC__ +#if defined(CRAY) #define XtOffset(p_type,field) _Offsetof(p_type,field) -#else -#ifdef CRAY2 -#define XtOffset(p_type,field) \ - (sizeof(int)*((unsigned int)&(((p_type)NULL)->field))) - -#else /* !CRAY2 */ - -#define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field)) - -#endif /* !CRAY2 */ -#endif /* __STDC__ */ -#else /* ! (CRAY || __arm) */ - +#else /* ! CRAY */ #define XtOffset(p_type,field) \ ((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL))) - #endif /* !CRAY */ #ifdef offsetof |