xserver: Branch 'master'

[Ian Romanick]

 GL/glx/glxext.h    |    5 -----
 GL/glx/glxserver.h |    3 ---
 2 files changed, 8 deletions(-)

New commits:
diff-tree 64479fffa22581cc7d753065c33eda5520b7db9a (from a0179281a6522ec59830e8f2549633741bc56e10)
Author: Ian Romanick <idr at us.ibm.com>
Date:   Wed Sep 6 16:13:21 2006 -0700

    Remove prototypes and externs for non-existant functions and variables.

diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h
index d708208..edd66a8 100644
--- a/GL/glx/glxext.h
+++ b/GL/glx/glxext.h
@@ -71,9 +71,6 @@ extern void __glXClearErrorOccured(void)
 extern GLboolean __glXErrorOccured(void);
 extern void __glXResetLargeCommandStatus(__GLXclientState*);
 
-extern int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc);
-extern int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc);
-
 extern int DoMakeCurrent( __GLXclientState *cl, GLXDrawable drawId,
     GLXDrawable readId, GLXContextID contextId, GLXContextTag tag );
 extern int DoGetVisualConfigs(__GLXclientState *cl, unsigned screen,
@@ -93,8 +90,6 @@ extern int DoRenderLarge(__GLXclientStat
 
 extern void GlxExtensionInit(void);
 
-extern Bool __glXCoreType(void);
-
 extern const char GLServerVersion[];
 extern int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap);
 
diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h
index a79520e..8389737 100644
--- a/GL/glx/glxserver.h
+++ b/GL/glx/glxserver.h
@@ -191,7 +191,6 @@ typedef int (*__GLXdispatchVendorPrivPro
  * Dispatch for GLX commands.
  */
 typedef int (*__GLXprocPtr)(__GLXclientState *, char *pc);
-extern __GLXprocPtr __glXProcTable[];
 
 /*
  * Tables for computing the size of each rendering command.
@@ -252,6 +251,4 @@ extern int __glXImageSize(GLenum format,
     GLint imageHeight, GLint rowLength, GLint skipImages, GLint skipRows,
     GLint alignment);
 
-extern int __glXDrawArraysReqSize(const GLbyte *pc, Bool swap);
-
 #endif /* !__GLX_server_h__ */