frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move XRes from extmod to built-in 

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

Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Tomas Carnecky 2012-07-10 02:03:05 +01:00 committed by Keith Packard
parent ba21fc2958
commit 7d859bd878
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/Makefile.am
View File

@ -52,7 +52,7 @@ endif
# XResource extension: lets clients get data about per-client resource usage # XResource extension: lets clients get data about per-client resource usage
RES_SRCS = hashtable.c hashtable.h xres.c RES_SRCS = hashtable.c hashtable.h xres.c
if RES if RES
MODULE_SRCS += $(RES_SRCS) BUILTIN_SRCS += $(RES_SRCS)
endif endif
# MIT ScreenSaver extension # MIT ScreenSaver extension

2
Xext/xres.c
View File

@ -190,6 +190,8 @@ DestroyConstructResourceBytesCtx(ConstructResourceBytesCtx *ctx)
ht_destroy(ctx->visitedResources); ht_destroy(ctx->visitedResources);
} }
extern void ResExtensionInit(void);
static int static int
ProcXResQueryVersion(ClientPtr client) ProcXResQueryVersion(ClientPtr client)
{ {

8
hw/xfree86/dixmods/extmod/modinit.c
View File

@ -77,14 +77,6 @@ static ExtensionModule extensionModules[] = {
NULL, NULL,
NULL}, NULL},
#endif #endif
#ifdef RES
{
ResExtensionInit,
XRES_NAME,
&noResExtension,
NULL,
NULL},
#endif
}; };
static XF86ModuleVersionInfo VersRec = { static XF86ModuleVersionInfo VersRec = {

2
include/extinit.h
View File

@ -104,7 +104,7 @@ extern void RecordExtensionInit(void);
extern Bool noRenderExtension; extern Bool noRenderExtension;
extern void RenderExtensionInit(void); extern void RenderExtensionInit(void);
#if defined(RES) && !defined(XorgLoader) #if defined(RES)
#include <X11/extensions/XResproto.h> #include <X11/extensions/XResproto.h>
extern Bool noResExtension; extern Bool noResExtension;
extern void ResExtensionInit(void); extern void ResExtensionInit(void);

3
mi/miinitext.c
View File

@ -409,6 +409,9 @@ static ExtensionModule staticExtensions[] = {
#ifdef DPMSExtension #ifdef DPMSExtension
{DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension, NULL}, {DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension, NULL},
#endif #endif
#ifdef RES
{ResExtensionInit, XRES_NAME, &noResExtension, NULL},
#endif
}; };
/*ARGSUSED*/ void /*ARGSUSED*/ void