Commit 7d859bd8 authored by Tomas Carnecky's avatar Tomas Carnecky Committed by Keith Packard

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: default avatarTomas Carnecky <tom@dbservice.com>
Reviewed-by: default avatarDaniel Stone <daniel@fooishbar.org>
Reviewed-by: default avatarJamey Sharp <jamey@minilop.net>
Signed-off-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent ba21fc29
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment