diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-31 17:31:36 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-07-31 17:31:36 -0400 |
| commit | 63bdd4c27d47323b3282bf0b6eaecae91c79b45c (patch) | |
| tree | 8d711011bafdbfa0b38a9e0b389ae66091039d57 | |
| parent | 8d214bc26f9b7ab6a5c54d7749cd4b6811cb0b96 (diff) | |
Unifdef XIDLE.
Seriously how was this still here.
| -rw-r--r-- | hw/xfree86/loader/dixsym.c | 3 | ||||
| -rw-r--r-- | include/globals.h | 3 | ||||
| -rw-r--r-- | mi/miinitext.c | 12 | ||||
| -rw-r--r-- | os/utils.c | 3 |
4 files changed, 0 insertions, 21 deletions
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 33a687aa8..220d25c37 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -403,9 +403,6 @@ _X_HIDDEN void *dixLookupTab[] = { SYMVAR(noXInputExtension) -#ifdef XIDLE - SYMVAR(noXIdleExtension) -#endif #ifdef XSELINUX SYMVAR(noSELinuxExtension) #endif diff --git a/include/globals.h b/include/globals.h index c1c8c6782..a95096f81 100644 --- a/include/globals.h +++ b/include/globals.h @@ -128,9 +128,6 @@ extern Bool noPanoramiXExtension; extern Bool noXInputExtension; -#ifdef XIDLE -extern Bool noXIdleExtension; -#endif #ifdef XSELINUX extern Bool noSELinuxExtension; diff --git a/mi/miinitext.c b/mi/miinitext.c index 393ee8408..6516f43db 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -148,9 +148,6 @@ extern Bool noPanoramiXExtension; extern Bool noPseudoramiXExtension; #endif extern Bool noXInputExtension; -#ifdef XIDLE -extern Bool noXIdleExtension; -#endif #ifdef XSELINUX extern Bool noSELinuxExtension; #endif @@ -212,9 +209,6 @@ extern void XInputExtensionInit(INITARGS); extern void XTestExtensionInit(INITARGS); #endif extern void BigReqExtensionInit(INITARGS); -#ifdef XIDLE -extern void XIdleExtensionInit(INITARGS); -#endif #ifdef SCREENSAVER extern void ScreenSaverExtensionInit (INITARGS); #endif @@ -422,9 +416,6 @@ InitExtensions(int argc, char *argv[]) if (!noTestExtensions) XTestExtensionInit(); #endif BigReqExtensionInit(); -#ifdef XIDLE - if (!noXIdleExtension) XIdleExtensionInit(); -#endif #if defined(SCREENSAVER) if (!noScreenSaverExtension) ScreenSaverExtensionInit (); #endif @@ -519,9 +510,6 @@ static ExtensionModule staticExtensions[] = { { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL }, #endif { BigReqExtensionInit, "BIG-REQUESTS", NULL, NULL, NULL }, -#ifdef XIDLE - { XIdleExtensionInit, "XIDLE", &noXIdleExtension, NULL, NULL }, -#endif { SyncExtensionInit, "SYNC", NULL, NULL, NULL }, #ifdef XKB { XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL }, diff --git a/os/utils.c b/os/utils.c index 0682bef82..88a64950d 100644 --- a/os/utils.c +++ b/os/utils.c @@ -188,9 +188,6 @@ _X_EXPORT Bool noXFixesExtension = FALSE; _X_EXPORT Bool noPanoramiXExtension = TRUE; #endif _X_EXPORT Bool noXInputExtension = FALSE; -#ifdef XIDLE -_X_EXPORT Bool noXIdleExtension = FALSE; -#endif #ifdef XSELINUX _X_EXPORT Bool noSELinuxExtension = FALSE; _X_EXPORT int selinuxEnforcingState = SELINUX_MODE_DEFAULT; |