diff options
author | Sven Gothel <[email protected]> | 2015-03-06 09:42:13 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-03-06 09:42:13 +0100 |
commit | 0674a3678d747335ad36f0f57e3bdc9c168f0dcf (patch) | |
tree | a6841c14fc41ca14586f684136fe792362094195 /make/stub_includes/x11/X11 | |
parent | a554616fae30facd7574679b5c8b244757b7ccd9 (diff) |
Bug 1135 - Fix other GL header and windows-system header
- GL/gl.h: remove added gl-types.h include, which causes 'redefined' warnings or errors.
- GLES/glext.h: Use vanilla 'typedef void* GLeglImageOES'
- opengl/gl-types.h: Complete all GL types
- Fix windows.h and all its related header
Diffstat (limited to 'make/stub_includes/x11/X11')
-rw-r--r-- | make/stub_includes/x11/X11/X.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/make/stub_includes/x11/X11/X.h b/make/stub_includes/x11/X11/X.h index 239836ee4..2deb46597 100644 --- a/make/stub_includes/x11/X11/X.h +++ b/make/stub_includes/x11/X11/X.h @@ -17,12 +17,10 @@ typedef XID Pixmap; typedef XID Window; typedef struct __GLXcontextRec *GLXContext; -//typedef void *GLXContext; typedef XID GLXPixmap; typedef XID GLXDrawable; /* GLX 1.3 and later */ typedef struct __GLXFBConfigRec *GLXFBConfig; -//typedef void *GLXFBConfig; typedef XID GLXFBConfigID; typedef XID GLXContextID; typedef XID GLXWindow; |