diff options
Diffstat (limited to 'include/misc.h')
| -rw-r--r-- | include/misc.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/misc.h b/include/misc.h index 5944a427f..2be1d66a6 100644 --- a/include/misc.h +++ b/include/misc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.28 2001/12/14 19:59:55 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -66,7 +65,6 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: misc.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef MISC_H #define MISC_H 1 /* @@ -83,11 +81,7 @@ extern unsigned long serverGeneration; #include <X11/X.h> #include <X11/Xdefs.h> -#ifndef IN_MODULE -#ifndef NULL #include <stddef.h> -#endif -#endif #ifndef MAXSCREENS #define MAXSCREENS 16 @@ -115,9 +109,7 @@ typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */ typedef struct _xReq *xReqPtr; #include "os.h" /* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */ -#ifndef IN_MODULE #include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */ -#endif #define NullBox ((BoxPtr)0) #define MILLI_PER_MIN (1000 * 60) @@ -145,12 +137,10 @@ typedef struct _xReq *xReqPtr; #define min(a, b) (((a) < (b)) ? (a) : (b)) #define max(a, b) (((a) > (b)) ? (a) : (b)) -#ifndef IN_MODULE /* abs() is a function, not a macro; include the file declaring * it in case we haven't done that yet. - */ + */ #include <stdlib.h> -#endif /* IN_MODULE */ #ifndef Fabs #define Fabs(a) ((a) > 0.0 ? (a) : -(a)) /* floating absolute value */ #endif @@ -166,7 +156,6 @@ typedef struct _xReq *xReqPtr; */ #define lowbit(x) ((x) & (~(x) + 1)) -#ifndef IN_MODULE /* XXX Not for modules */ #include <limits.h> #if !defined(MAXSHORT) || !defined(MINSHORT) || \ @@ -177,7 +166,6 @@ typedef struct _xReq *xReqPtr; */ #include <math.h> -#endif #undef MAXSHORT #define MAXSHORT SHRT_MAX #undef MINSHORT @@ -189,7 +177,7 @@ typedef struct _xReq *xReqPtr; #include <assert.h> #include <ctype.h> -#include <stdio.h> /* for fopen, etc... */ +#include <stdio.h> /* for fopen, etc... */ #endif |