aboutsummaryrefslogtreecommitdiffstats
path: root/src/glx/x11/glxclient.h
diff options
context:
space:
mode:
authorAlan Hourihane <[email protected]>2008-11-28 16:19:10 +0000
committerAlan Hourihane <[email protected]>2008-11-28 16:19:10 +0000
commitc4c86bbd16688ee4a0afb32efa27ba52abceb1ca (patch)
tree6b16fae74e49122a86ecf18b4a427b80d5a8e812 /src/glx/x11/glxclient.h
parent5b714723895d321db753f896576de5e2c27778c3 (diff)
parentc303e7299b5f95d4728c3710c56f50b1fefca09d (diff)
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'src/glx/x11/glxclient.h')
-rw-r--r--src/glx/x11/glxclient.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/glx/x11/glxclient.h b/src/glx/x11/glxclient.h
index 3b9076bdd72..467b0ebb7f9 100644
--- a/src/glx/x11/glxclient.h
+++ b/src/glx/x11/glxclient.h
@@ -741,8 +741,10 @@ extern void _XSend(Display*, const void*, long);
extern void __glXInitializeVisualConfigFromTags( __GLcontextModes *config,
int count, const INT32 *bp, Bool tagged_only, Bool fbconfig_style_tags );
-extern char * __glXGetStringFromServer( Display * dpy, int opcode,
- CARD32 glxCode, CARD32 for_whom, CARD32 name );
+extern char * __glXQueryServerString(Display* dpy, int opcode,
+ CARD32 screen, CARD32 name);
+extern char * __glXGetString(Display* dpy, int opcode,
+ CARD32 screen, CARD32 name);
extern char *__glXstrdup(const char *str);