From 3136450d49cc52d5180f644d01a1e425f388ba7e Mon Sep 17 00:00:00 2001 From: Diederick Niehorster Date: Tue, 25 Sep 2012 07:46:25 +0000 Subject: [PATCH] fixing conflicts with opengl headers on some systems, same solution as by John in r1385 git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1390 7f0cb862-5218-0410-a997-914c9d46530a --- progs/demos/shapes/shapes.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/progs/demos/shapes/shapes.c b/progs/demos/shapes/shapes.c index e91a969..c22c055 100644 --- a/progs/demos/shapes/shapes.c +++ b/progs/demos/shapes/shapes.c @@ -91,9 +91,12 @@ typedef char ourGLchar; #define APIENTRY #endif +#ifndef GL_VERSION_1_5 typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage); +#endif +#ifndef GL_VERSION_2_0 typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type); typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length); typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader); @@ -109,6 +112,7 @@ typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourG typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); typedef void (APIENTRY *PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +#endif PFNGLCREATESHADERPROC gl_CreateShader; PFNGLSHADERSOURCEPROC gl_ShaderSource; -- 1.7.10.4