diff options
| author | Michael Bien <[email protected]> | 2009-08-08 21:43:30 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2009-08-08 21:43:30 +0200 |
| commit | 8ef9d7364a942c19ec5e1f306e08193e83f4fea6 (patch) | |
| tree | 6dcf95825d2933992199a7062b15e38d3f721c95 /make/stub_includes/opengl/GL/glx.h | |
| parent | 2a8e9876ca4567de3b08813c280d006f9b2c32e6 (diff) | |
| parent | fb3e50b4e7e11df911a83ab7966cf8f293c20da2 (diff) | |
Merge branch 'master' of ssh://[email protected]/jogl~jogl-git
Diffstat (limited to 'make/stub_includes/opengl/GL/glx.h')
| -rw-r--r-- | make/stub_includes/opengl/GL/glx.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/make/stub_includes/opengl/GL/glx.h b/make/stub_includes/opengl/GL/glx.h index 4032f45da..67225e043 100644 --- a/make/stub_includes/opengl/GL/glx.h +++ b/make/stub_includes/opengl/GL/glx.h @@ -66,9 +66,9 @@ extern "C" { #define GLX_VERSION_1_4 1 */ -#define GLX_EXTENSION_NAME "GLX" - +#ifndef GLX_VERSION_1_X +#define GLX_EXTENSION_NAME "GLX" /* * Tokens for glXChooseVisual and glXGetConfig: @@ -192,8 +192,12 @@ typedef XID GLXContextID; typedef XID GLXWindow; typedef XID GLXPbuffer; +#endif /* GLX_VERSION_1_X */ +#ifndef GLX_VERSION_1_X +#define GLX_VERSION_1_X 1 + extern XVisualInfo* glXChooseVisual( Display *dpy, int screen, int *attribList ); @@ -300,6 +304,8 @@ extern void glXGetSelectedEvent( Display *dpy, GLXDrawable drawable, /* GLX 1.4 and later */ extern void (*glXGetProcAddress(const GLubyte *procname))(); +#endif /* GLX_VERSION_1_X */ + #ifndef GLX_GLXEXT_LEGACY #include <GL/glxext.h> |