diff options
| author | Tomas Carnecky <tom@dbservice.com> | 2012-07-10 02:03:05 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-09 23:28:37 -0700 |
| commit | 7d859bd87834dd79c7fa3792075496ece698c082 (patch) | |
| tree | fd047fd18cadaa4fe76012aa90f2206690c62123 /Xext | |
| parent | ba21fc29587e4f11320b88a70433beb1fe22cdf3 (diff) | |
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>
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/Makefile.am | 2 | ||||
| -rw-r--r-- | Xext/xres.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 15cbdab61..5837be076 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 445abcab8..7d21ad7e9 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) { |