[PATCH 21/54] Move XRes from extmod to built-in

[Daniel Stone]

From: Tomas Carnecky <tom at dbservice.com>

Always build XRes support into the core server, rather than letting it
languish in extmod.

Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
Reviewed-by: Jamey Sharp <jamey at minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 Xext/Makefile.am                    |    2 +-
 Xext/xres.c                         |    2 ++
 hw/xfree86/dixmods/extmod/modinit.c |    8 --------
 include/extinit.h                   |    2 +-
 mi/miinitext.c                      |    3 +++
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 15cbdab..5837be0 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -52,7 +52,7 @@ endif
 # XResource extension: lets clients get data about per-client resource usage
 RES_SRCS = hashtable.c hashtable.h xres.c
 if RES
-MODULE_SRCS  += $(RES_SRCS)
+BUILTIN_SRCS  += $(RES_SRCS)
 endif
 
 # MIT ScreenSaver extension
diff --git a/Xext/xres.c b/Xext/xres.c
index b40b37d..fcb255f 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -190,6 +190,8 @@ DestroyConstructResourceBytesCtx(ConstructResourceBytesCtx *ctx)
     ht_destroy(ctx->visitedResources);
 }
 
+extern void ResExtensionInit(void);
+
 static int
 ProcXResQueryVersion(ClientPtr client)
 {
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index bb120a2..3c69332 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -77,14 +77,6 @@ static ExtensionModule extensionModules[] = {
      NULL,
      NULL},
 #endif
-#ifdef RES
-    {
-     ResExtensionInit,
-     XRES_NAME,
-     &noResExtension,
-     NULL,
-     NULL},
-#endif
 };
 
 static XF86ModuleVersionInfo VersRec = {
diff --git a/include/extinit.h b/include/extinit.h
index 4d8aef5..589db1f 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -104,7 +104,7 @@ extern void RecordExtensionInit(void);
 extern Bool noRenderExtension;
 extern void RenderExtensionInit(void);
 
-#if defined(RES) && !defined(XorgLoader)
+#if defined(RES)
 #include <X11/extensions/XResproto.h>
 extern Bool noResExtension;
 extern void ResExtensionInit(void);
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 7464cab..2a54a1b 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -409,6 +409,9 @@ static ExtensionModule staticExtensions[] = {
 #ifdef DPMSExtension
     {DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension, NULL},
 #endif
+#ifdef RES
+    {ResExtensionInit, XRES_NAME, &noResExtension, NULL},
+#endif
 };
 
  /*ARGSUSED*/ void
-- 
1.7.10.4