[PATCH xserver 3/3] glx: Remove some unused stuff from glxserver.h
Adam Jackson
ajax at redhat.com
Wed Aug 16 18:49:18 UTC 2017
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
glx/glxserver.h | 13 -------------
glx/single2.c | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/glx/glxserver.h b/glx/glxserver.h
index a54ce4b92..31c635b97 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -54,7 +54,6 @@
** GLX resources.
*/
typedef XID GLXContextID;
-typedef XID GLXPixmap;
typedef XID GLXDrawable;
typedef struct __GLXclientStateRec __GLXclientState;
@@ -156,11 +155,6 @@ typedef int (*__GLXdispatchSingleProcPtr) (__GLXclientState *, GLbyte *);
typedef int (*__GLXdispatchVendorPrivProcPtr) (__GLXclientState *, GLbyte *);
/*
- * Dispatch for GLX commands.
- */
-typedef int (*__GLXprocPtr) (__GLXclientState *, char *pc);
-
-/*
* Tables for computing the size of each rendering command.
*/
typedef int (*gl_proto_size_func) (const GLbyte *, Bool, int);
@@ -177,18 +171,11 @@ typedef struct {
*/
extern RESTYPE __glXContextRes;
extern RESTYPE __glXClientRes;
-extern RESTYPE __glXPixmapRes;
extern RESTYPE __glXDrawableRes;
/************************************************************************/
/*
-** Prototypes.
-*/
-
-extern char *__glXcombine_strings(const char *, const char *);
-
-/*
* Routines for computing the size of variably-sized rendering commands.
*/
diff --git a/glx/single2.c b/glx/single2.c
index e7488194b..36a01f0cb 100644
--- a/glx/single2.c
+++ b/glx/single2.c
@@ -253,7 +253,7 @@ __glXDisp_Finish(__GLXclientState * cl, GLbyte * pc)
#define SEPARATOR " "
-char *
+static char *
__glXcombine_strings(const char *cext_string, const char *sext_string)
{
size_t clen, slen;
--
2.13.4
More information about the xorg-devel
mailing list