Commit f3ff2386 authored by Adam Jackson's avatar Adam Jackson

Sync is built-in and mandatory.

parent 3fcf4d3e
......@@ -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
......
......@@ -65,15 +65,6 @@ static ExtensionModule extensionModules[] = {
NULL
},
#endif
#ifdef XSYNC
{
SyncExtensionInit,
SYNC_NAME,
&noSyncExtension,
NULL,
NULL
},
#endif
#ifdef SCREENSAVER
{
ScreenSaverExtensionInit,
......
......@@ -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>
......
......@@ -372,9 +372,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef XCSECURITY
SYMVAR(noSecurityExtension)
#endif
#ifdef XSYNC
SYMVAR(noSyncExtension)
#endif
#ifdef RES
SYMVAR(noResExtension)
#endif
......
......@@ -89,10 +89,6 @@ extern Bool noRenderExtension;
extern Bool noSecurityExtension;
#endif
#ifdef XSYNC
extern Bool noSyncExtension;
#endif
#ifdef RES
extern Bool noResExtension;
#endif
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment