diff options
| author | Sven Gothel <[email protected]> | 2015-10-08 00:20:25 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-10-08 00:20:25 +0200 |
| commit | 56eb5025694064ad3e25cf2fb7ba0cabbda8ee67 (patch) | |
| tree | 5863d9dee1bfbae1d9720e0472f0915ea72e910d /make/stub_includes | |
| parent | 96e71b020a48e8a01e3790e81bd888977d9cab6d (diff) | |
Bug 1189: Fix gcc redefinition error, even thought typedef equals - on OpenIndiana w/ old'ish gcc
Diffstat (limited to 'make/stub_includes')
| -rw-r--r-- | make/stub_includes/opengl/GLES2/gl2ext-supplement.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/make/stub_includes/opengl/GLES2/gl2ext-supplement.h b/make/stub_includes/opengl/GLES2/gl2ext-supplement.h index 812f6abcd..c43261f3f 100644 --- a/make/stub_includes/opengl/GLES2/gl2ext-supplement.h +++ b/make/stub_includes/opengl/GLES2/gl2ext-supplement.h @@ -120,13 +120,17 @@ GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target #ifdef GL_GLEXT_PROTOTYPES GL_APICALL void GL_APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); GL_APICALL void GL_APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +#ifndef GL_ES_VERSION_3_1 GL_APICALL void GL_APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val); GL_APICALL void GL_APIENTRY glSampleMaski (GLuint index, GLbitfield mask); +#endif /* GL_ES_VERSION_3_1 */ #endif /* GL_GLEXT_PROTOTYPES */ typedef void (GL_APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +#ifndef GL_ES_VERSION_3_1 typedef void (GL_APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val); typedef void (GL_APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask); +#endif /* GL_ES_VERSION_3_1 */ #endif #ifdef __cplusplus |