[PATCH 12/37] Move XRes from extmod to built-in
Daniel Stone
daniel at fooishbar.org
Tue Jun 28 12:27:28 PDT 2011
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>
---
Xext/Makefile.am | 2 +-
Xext/xres.c | 2 ++
hw/xfree86/dixmods/extmod/modinit.c | 9 ---------
mi/miinitext.c | 3 +++
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index adea06e..04e1b36 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 = 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 8d0ef30..c9487a3 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -23,6 +23,8 @@
#include "modinit.h"
#include "protocol-versions.h"
+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 6625f26..9a3b811 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -81,15 +81,6 @@ static ExtensionModule extensionModules[] = {
NULL
},
#endif
-#ifdef RES
- {
- ResExtensionInit,
- XRES_NAME,
- &noResExtension,
- NULL,
- NULL
- },
-#endif
{ /* DON'T delete this entry ! */
NULL,
NULL,
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 79786aa..4e76c8e 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -530,6 +530,9 @@ static ExtensionModule staticExtensions[] = {
#ifdef DPMSExtension
{ DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension, NULL },
#endif
+#ifdef RES
+ { ResExtensionInit, XRES_NAME, &noResExtension, NULL },
+#endif
{ NULL, NULL, NULL, NULL, NULL }
};
--
1.7.5.4
More information about the xorg-devel
mailing list