diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:14:24 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:14:24 +0100 |
| commit | b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9 (patch) | |
| tree | ee0d60bb4a9c500f6072891a7802fd06be15ce8a /nx-X11/programs/Xserver/include/misc.h | |
| parent | 62f8e50e7a5ddc6952a951edc37ee53c2a828675 (diff) | |
| parent | 508d2deae98846111299a3693033a507010e3c91 (diff) | |
| download | nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.tar.gz nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.tar.bz2 nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.zip | |
Merge branch 'sunweaver-pr/extmod-xfree86loader-cleanup' into 3.6.x
Attributes GH PR #251: https://github.com/ArcticaProject/nx-libs/pull/251
Diffstat (limited to 'nx-X11/programs/Xserver/include/misc.h')
| -rw-r--r-- | nx-X11/programs/Xserver/include/misc.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h index 3255e2201..27137cd50 100644 --- a/nx-X11/programs/Xserver/include/misc.h +++ b/nx-X11/programs/Xserver/include/misc.h @@ -96,11 +96,9 @@ extern unsigned long serverGeneration; #include <nx-X11/Xdefs.h> -#ifndef IN_MODULE #ifndef NULL #include <stddef.h> #endif -#endif #ifndef MAXSCREENS #define MAXSCREENS 16 @@ -128,9 +126,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 <nx-X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */ -#endif #define NullBox ((BoxPtr)0) #define MILLI_PER_MIN (1000 * 60) @@ -158,12 +154,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 @@ -179,7 +173,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) || \ @@ -204,8 +197,6 @@ typedef struct _xReq *xReqPtr; #include <ctype.h> #include <stdio.h> /* for fopen, etc... */ -#endif - /** * Calculate the number of bytes needed to hold bits. * @param bits The minimum number of bits needed. |