summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-07-24 15:28:07 -0400
committerAdam Jackson <ajax@redhat.com>2008-07-24 15:46:08 -0400
commitf3ff2386016ced7e677817e9761a535f0f385813 (patch)
treebe66e1772735d9ac479183dbabeb74f84788e936 /mi
parent3fcf4d3eb89fecaa2be7b5ac4933b693c9c3d97e (diff)
Sync is built-in and mandatory.
Diffstat (limited to 'mi')
-rw-r--r--mi/miinitext.c13
1 files changed, 2 insertions, 11 deletions
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