diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /Xext/xres.c | |
parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'Xext/xres.c')
-rw-r--r-- | Xext/xres.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Xext/xres.c b/Xext/xres.c index ca670be24..c024f7be8 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -1,7 +1,7 @@ /* Copyright (c) 2002 XFree86 Inc */ -/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.5 2002/07/01 02:25:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.8 2003/10/28 23:08:44 tsi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES @@ -14,10 +14,7 @@ #include "swaprep.h" #include "XResproto.h" #include "pixmapstr.h" - -extern RESTYPE lastResourceType; -extern RESTYPE TypeMask; -extern Atom *ResourceNames; +#include "modinit.h" static int ProcXResQueryVersion (ClientPtr client) @@ -30,6 +27,8 @@ ProcXResQueryVersion (ClientPtr client) client_major = stuff->client_major; client_minor = stuff->client_minor; + (void) client_major; + (void) client_minor; rep.type = X_Reply; rep.length = 0; @@ -314,11 +313,9 @@ SProcResDispatch (ClientPtr client) } void -ResExtensionInit(void) +ResExtensionInit(INITARGS) { - ExtensionEntry *extEntry; - - extEntry = AddExtension(XRES_NAME, 0, 0, + (void) AddExtension(XRES_NAME, 0, 0, ProcResDispatch, SProcResDispatch, ResResetProc, StandardMinorOpcode); |