From 4af77a92acf5bc2e27f9dea444a8c84d6775cf77 Mon Sep 17 00:00:00 2001 From: Sven Gothel <sgothel@jausoft.com> Date: Mon, 15 Jul 2013 20:08:52 +0200 Subject: Fix regressions of commit 3a0d7703da32e9a5ddf08a334f18588a78038d88: Avoid CPP redefinitions --- make/stub_includes/opengl/GLES2/gl2ext.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'make/stub_includes/opengl/GLES2/gl2ext.h') diff --git a/make/stub_includes/opengl/GLES2/gl2ext.h b/make/stub_includes/opengl/GLES2/gl2ext.h index b658fc8ba..c3c909a61 100644 --- a/make/stub_includes/opengl/GLES2/gl2ext.h +++ b/make/stub_includes/opengl/GLES2/gl2ext.h @@ -1571,6 +1571,7 @@ GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target); GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params); GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params); #endif +#ifndef GL_EXT_disjoint_timer_query typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids); typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids); typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id); @@ -1578,6 +1579,7 @@ typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id); typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target); typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params); typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params); +#endif /* GL_EXT_disjoint_timer_query */ #endif /* GL_EXT_read_format_bgra */ -- cgit v1.2.3