diff options
| author | Brian <[email protected]> | 2007-05-19 08:56:15 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-05-19 08:56:15 -0600 |
| commit | 74519c42311c67a2f914768abbe905d321702386 (patch) | |
| tree | 220523e5cc181de70166f85987151d89ef3b74fd | |
| parent | 80a579871904a05226bceeca6cf8725f58ed358e (diff) | |
Disable (at least for now) PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC typedef.
If an app (like progs/samples/blendxor.c) includes both gl.h and glext.h
this typedef will get hit in both headers, causing an error.
Possibly work around by bringing GL_NV_geometry_program4 items into gl.h.
| -rw-r--r-- | include/GL/gl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index 6e92481a536..a388de36e49 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -2221,8 +2221,13 @@ GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); #endif /* GL_GLEXT_PROTOTYPES */ +#if 0 +/* (temporarily) disabled because of collision with typedef in glext.h + * that happens if apps include both gl.h and glext.h + */ typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); +#endif #define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 #define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 |