[PATCH] 3/5 various cleanups
Warren Turkal
wt@midsouth.rr.com
Thu, 12 Feb 2004 05:49:47 -0600
This is the first of 5 cleanup patches I have made. I don't think these
patches conflict, but it would be best to apply them in numerical order.
wt
This makes of MITMISC and XCMISC always build.
diff -Nru3 xserver-old/configure.ac xserver/configure.ac
--- xserver-old/configure.ac 2004-02-12 00:18:03.000000000 -0600
+++ xserver/configure.ac 2004-02-12 00:22:17.000000000 -0600
@@ -281,10 +281,8 @@
AC_DEFINE(SMART_SCHEDULE,1,[Include time-based scheduler])
AC_DEFINE(NDEBUG,1,[Disable some debugging code])
AC_DEFINE(USE_RGB_TXT,1,[Use rgb.txt directly])
-AC_DEFINE(MITMISC,1,[Support MIT Misc extension])
AC_DEFINE(XTEST,1,[Support XTest extension])
AC_DEFINE(XSYNC,1,[Support XSync extension])
-AC_DEFINE(XCMISC,1,[Support XCMisc extension])
AC_DEFINE(PIXPRIV,1,[Support pixmap privates])
AC_DEFINE(XFIXES,1,[Support XFixes extension])
EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/xfixes/libxfixes.a'
diff -Nru3 xserver-old/mi/miinitext.c xserver/mi/miinitext.c
--- xserver-old/mi/miinitext.c 2004-02-12 00:18:03.000000000 -0600
+++ xserver/mi/miinitext.c 2004-02-12 00:21:53.000000000 -0600
@@ -268,9 +268,7 @@
if (!noTestExtensions) XTestExtensionInit();
#endif
BigReqExtensionInit();
-#ifdef MITMISC
MITMiscExtensionInit();
-#endif
#ifdef XIDLE
XIdleExtensionInit();
#endif
@@ -293,9 +291,7 @@
#if defined(XKB) && !defined(PRINT_ONLY_SERVER)
&& !defined(NO_HW_ONLY_EXTS)
if (!noXkbExtension) XkbExtensionInit();
#endif
-#ifdef XCMISC
XCMiscExtensionInit();
-#endif
#ifdef XRECORD
if (!noTestExtensions) RecordExtensionInit();
#endif
--
Warren Turkal
President, GOLUM, Inc.
http://www.golum.org