diff options
Diffstat (limited to 'os/utils.c')
| -rw-r--r-- | os/utils.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/os/utils.c b/os/utils.c index e41c3664b..ffa4958cf 100644 --- a/os/utils.c +++ b/os/utils.c @@ -139,13 +139,9 @@ _X_EXPORT Bool noTestExtensions; _X_EXPORT Bool noBigReqExtension = FALSE; #endif #ifdef COMPOSITE - #ifdef XFree86Server - /* COMPOSITE is disabled by default for now until the - * interface is stable */ - #define COMPOSITE_DEFAULT FALSE - #else - #define COMPOSITE_DEFAULT TRUE - #endif + /* COMPOSITE is disabled by default for now until the + * interface is stable */ + #define COMPOSITE_DEFAULT FALSE _X_EXPORT Bool noCompositeExtension = !COMPOSITE_DEFAULT; #endif @@ -268,12 +264,6 @@ int SyncOn = 0; extern int SelectWaitTime; #endif -#ifdef DEBUG -#ifndef SPECIAL_MALLOC -#define MEMBUG -#endif -#endif - #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED) #define HAS_SAVED_IDS_AND_SETEUID #endif @@ -549,7 +539,6 @@ GiveUp(int sig) errno = olderrno; } -#ifndef DDXTIME _X_EXPORT CARD32 GetTimeInMillis(void) { @@ -558,7 +547,6 @@ GetTimeInMillis(void) X_GETTIMEOFDAY(&tp); return(tp.tv_sec * 1000) + (tp.tv_usec / 1000); } -#endif _X_EXPORT void AdjustWaitForDelay (pointer waitTime, unsigned long newdelay) |