Making the "smooth_opengl3" typedefs to be Windows only per a discussion on the devel...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@851 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c
index d72cf65..a36f090 100755 (executable)
--- a/progs/demos/smooth_opengl3/smooth_opengl3.c
+++ b/progs/demos/smooth_opengl3/smooth_opengl3.c
@@ -93,67 +93,52 @@ void checkError(const char *functionName)
 
 typedef ptrdiff_t ourGLsizeiptr;
 typedef char ourGLchar;
-
+\r
+#if defined(WIN32)
 #ifndef APIENTRY
 #define APIENTRY
 #endif
 
 typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-PFNGLGENBUFFERSPROC gl_GenBuffers;
-
 typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-PFNGLBINDBUFFERPROC gl_BindBuffer;
-
 typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
-PFNGLBUFFERDATAPROC gl_BufferData;
-
 typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type);
-PFNGLCREATESHADERPROC gl_CreateShader;
-
 typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length);
-PFNGLSHADERSOURCEPROC gl_ShaderSource;
-
 typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader);
-PFNGLCOMPILESHADERPROC gl_CompileShader;
-
 typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void);
-PFNGLCREATEPROGRAMPROC gl_CreateProgram;
-
 typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-PFNGLATTACHSHADERPROC gl_AttachShader;
-
 typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program);
-PFNGLLINKPROGRAMPROC gl_LinkProgram;
-
 typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program);
-PFNGLUSEPROGRAMPROC gl_UseProgram;
-
 typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-PFNGLGETSHADERIVPROC gl_GetShaderiv;
-
 typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
-PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog;
-
 typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params);
-PFNGLGETPROGRAMIVPROC gl_GetProgramiv;
-
 typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
-PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog;
-
 typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name);
-PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation;
-
 typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer;
-
 typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray;
-
 typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
-PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation;
-
 typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv;
+#endif  /* defined(WIN32) */\r
+\r
+PFNGLGENBUFFERSPROC gl_GenBuffers;\r
+PFNGLBINDBUFFERPROC gl_BindBuffer;\r
+PFNGLBUFFERDATAPROC gl_BufferData;\r
+PFNGLCREATESHADERPROC gl_CreateShader;\r
+PFNGLSHADERSOURCEPROC gl_ShaderSource;\r
+PFNGLCOMPILESHADERPROC gl_CompileShader;\r
+PFNGLCREATEPROGRAMPROC gl_CreateProgram;\r
+PFNGLATTACHSHADERPROC gl_AttachShader;\r
+PFNGLLINKPROGRAMPROC gl_LinkProgram;\r
+PFNGLUSEPROGRAMPROC gl_UseProgram;\r
+PFNGLGETSHADERIVPROC gl_GetShaderiv;\r
+PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog;\r
+PFNGLGETPROGRAMIVPROC gl_GetProgramiv;\r
+PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog;\r
+PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation;\r
+PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer;\r
+PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray;\r
+PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation;\r
+PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv;\r
 
 void initExtensionEntries(void) 
 {