[Freeglut-cvs] SF.net SVN: freeglut:[1390] trunk/freeglut/freeglut/progs/demos/shapes/ shapes.c

[<dc...@us...>]

Revision: 1390
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1390&view=rev
Author:   dcnieho
Date:     2012-09-25 07:46:25 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
fixing conflicts with opengl headers on some systems, same solution as
by John in r1385

Revision Links:
--------------
    http://freeglut.svn.sourceforge.net/freeglut/?rev=1385&view=rev

Modified Paths:
--------------
    trunk/freeglut/freeglut/progs/demos/shapes/shapes.c

Modified: trunk/freeglut/freeglut/progs/demos/shapes/shapes.c
===================================================================
--- trunk/freeglut/freeglut/progs/demos/shapes/shapes.c	2012-09-25 07:39:13 UTC (rev 1389)
+++ trunk/freeglut/freeglut/progs/demos/shapes/shapes.c	2012-09-25 07:46:25 UTC (rev 1390)
@@ -91,9 +91,12 @@
 #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 *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;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.