diff options
| -rw-r--r-- | Xext/Makefile.am | 10 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.c | 9 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.h | 7 | ||||
| -rw-r--r-- | hw/xfree86/loader/dixsym.c | 3 | ||||
| -rw-r--r-- | include/globals.h | 4 | ||||
| -rw-r--r-- | mi/miinitext.c | 13 | ||||
| -rw-r--r-- | os/WaitFor.c | 2 | ||||
| -rw-r--r-- | os/utils.c | 3 |
8 files changed, 7 insertions, 44 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index a9412165d..60b4c4c6c 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -21,16 +21,16 @@ endif # Sources always included in libXextbuiltin.la & libXext.la BUILTIN_SRCS = \ bigreq.c \ + geext.c \ shape.c \ sleepuntil.c \ sleepuntil.h \ + sync.c \ xcmisc.c \ - xtest.c \ - geext.c + xtest.c -# Sources always included in libXextmodule.la & libXext.la -MODULE_SRCS = \ - sync.c +# Sources always included in libXextmodule.la & libXext.la. That's right, zero. +MODULE_SRCS = # Optional sources included if extension enabled by configure.ac rules diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index 85ef198a4..9bcf51f00 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -65,15 +65,6 @@ static ExtensionModule extensionModules[] = { NULL }, #endif -#ifdef XSYNC - { - SyncExtensionInit, - SYNC_NAME, - &noSyncExtension, - NULL, - NULL - }, -#endif #ifdef SCREENSAVER { ScreenSaverExtensionInit, diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index b48e42d77..613421339 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -27,13 +27,6 @@ extern void XTestExtensionInit(INITARGS); extern void XTestExtension1Init(INITARGS); #endif -#ifdef XSYNC -extern void SyncExtensionInit(INITARGS); -#define _SYNC_SERVER -#include <X11/extensions/sync.h> -#include <X11/extensions/syncstr.h> -#endif - #ifdef SCREENSAVER extern void ScreenSaverExtensionInit (INITARGS); #include <X11/extensions/saver.h> diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 9ac8af7b8..33a687aa8 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -372,9 +372,6 @@ _X_HIDDEN void *dixLookupTab[] = { #ifdef XCSECURITY SYMVAR(noSecurityExtension) #endif -#ifdef XSYNC - SYMVAR(noSyncExtension) -#endif #ifdef RES SYMVAR(noResExtension) #endif diff --git a/include/globals.h b/include/globals.h index 2f158ea16..c1c8c6782 100644 --- a/include/globals.h +++ b/include/globals.h @@ -89,10 +89,6 @@ extern Bool noRenderExtension; extern Bool noSecurityExtension; #endif -#ifdef XSYNC -extern Bool noSyncExtension; -#endif - #ifdef RES extern Bool noResExtension; #endif diff --git a/mi/miinitext.c b/mi/miinitext.c index ea54163bb..393ee8408 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -116,9 +116,6 @@ extern Bool noRenderExtension; #ifdef XCSECURITY extern Bool noSecurityExtension; #endif -#ifdef XSYNC -extern Bool noSyncExtension; -#endif #ifdef RES extern Bool noResExtension; #endif @@ -225,9 +222,7 @@ extern void ScreenSaverExtensionInit (INITARGS); extern void XvExtensionInit(INITARGS); extern void XvMCExtensionInit(INITARGS); #endif -#ifdef XSYNC extern void SyncExtensionInit(INITARGS); -#endif #ifdef XKB extern void XkbExtensionInit(INITARGS); #endif @@ -336,9 +331,6 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef XCSECURITY { "SECURITY", &noSecurityExtension }, #endif -#ifdef XSYNC - { "SYNC", &noSyncExtension }, -#endif #ifdef RES { "X-Resource", &noResExtension }, #endif @@ -442,9 +434,7 @@ InitExtensions(int argc, char *argv[]) XvMCExtensionInit(); } #endif -#ifdef XSYNC - if (!noSyncExtension) SyncExtensionInit(); -#endif + SyncExtensionInit(); #if defined(XKB) if (!noXkbExtension) XkbExtensionInit(); #endif @@ -532,6 +522,7 @@ static ExtensionModule staticExtensions[] = { #ifdef XIDLE { XIdleExtensionInit, "XIDLE", &noXIdleExtension, NULL, NULL }, #endif + { SyncExtensionInit, "SYNC", NULL, NULL, NULL }, #ifdef XKB { XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL }, #endif diff --git a/os/WaitFor.c b/os/WaitFor.c index da12976ca..f07388be4 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -364,7 +364,6 @@ WaitForSomething(int *pClientsReady) curclient = XFD_FD(&savedClientsReadable, i); client_index = GetConnectionTranslation(curclient); #endif -#ifdef XSYNC /* We implement "strict" priorities. * Only the highest priority client is returned to * dix. If multiple clients at the same priority are @@ -391,7 +390,6 @@ WaitForSomething(int *pClientsReady) * clients get batched together */ else if (client_priority == highest_priority) -#endif { pClientsReady[nready++] = client_index; } diff --git a/os/utils.c b/os/utils.c index a28db551e..19b7a7dcf 100644 --- a/os/utils.c +++ b/os/utils.c @@ -159,9 +159,6 @@ _X_EXPORT Bool noRenderExtension = FALSE; #ifdef XCSECURITY _X_EXPORT Bool noSecurityExtension = FALSE; #endif -#ifdef XSYNC -_X_EXPORT Bool noSyncExtension = FALSE; -#endif #ifdef RES _X_EXPORT Bool noResExtension = FALSE; #endif |