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:
parent
ba21fc2958
commit
7d859bd878
|
@ -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
|
||||
|
|
|
@ -190,6 +190,8 @@ DestroyConstructResourceBytesCtx(ConstructResourceBytesCtx *ctx)
|
|||
ht_destroy(ctx->visitedResources);
|
||||
}
|
||||
|
||||
extern void ResExtensionInit(void);
|
||||
|
||||
static int
|
||||
ProcXResQueryVersion(ClientPtr client)
|
||||
{
|
||||
|
|
|
@ -77,14 +77,6 @@ static ExtensionModule extensionModules[] = {
|
|||
NULL,
|
||||
NULL},
|
||||
#endif
|
||||
#ifdef RES
|
||||
{
|
||||
ResExtensionInit,
|
||||
XRES_NAME,
|
||||
&noResExtension,
|
||||
NULL,
|
||||
NULL},
|
||||
#endif
|
||||
};
|
||||
|
||||
static XF86ModuleVersionInfo VersRec = {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -409,6 +409,9 @@ static ExtensionModule staticExtensions[] = {
|
|||
#ifdef DPMSExtension
|
||||
{DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension, NULL},
|
||||
#endif
|
||||
#ifdef RES
|
||||
{ResExtensionInit, XRES_NAME, &noResExtension, NULL},
|
||||
#endif
|
||||
};
|
||||
|
||||
/*ARGSUSED*/ void
|
||||
|
|
Loading…
Reference in New Issue
Block a user