From 35a69bde5350e28b10534080f8dc3b490c8bd54e Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Sun, 23 Jan 2011 14:18:25 +0000 Subject: [PATCH 1/1] Removing a bunch of Windows line endings -- see bug report 3077828 git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@882 7f0cb862-5218-0410-a997-914c9d46530a --- progs/demos/smooth_opengl3/smooth_opengl3.c | 44 +++++++++++++-------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c index a36f090..8784759 100755 --- a/progs/demos/smooth_opengl3/smooth_opengl3.c +++ b/progs/demos/smooth_opengl3/smooth_opengl3.c @@ -93,8 +93,7 @@ void checkError(const char *functionName) typedef ptrdiff_t ourGLsizeiptr; typedef char ourGLchar; - -#if defined(WIN32) + #ifndef APIENTRY #define APIENTRY #endif @@ -118,27 +117,26 @@ typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#endif /* defined(WIN32) */ - -PFNGLGENBUFFERSPROC gl_GenBuffers; -PFNGLBINDBUFFERPROC gl_BindBuffer; -PFNGLBUFFERDATAPROC gl_BufferData; -PFNGLCREATESHADERPROC gl_CreateShader; -PFNGLSHADERSOURCEPROC gl_ShaderSource; -PFNGLCOMPILESHADERPROC gl_CompileShader; -PFNGLCREATEPROGRAMPROC gl_CreateProgram; -PFNGLATTACHSHADERPROC gl_AttachShader; -PFNGLLINKPROGRAMPROC gl_LinkProgram; -PFNGLUSEPROGRAMPROC gl_UseProgram; -PFNGLGETSHADERIVPROC gl_GetShaderiv; -PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog; -PFNGLGETPROGRAMIVPROC gl_GetProgramiv; -PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog; -PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation; -PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer; -PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray; -PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation; -PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv; + +PFNGLGENBUFFERSPROC gl_GenBuffers; +PFNGLBINDBUFFERPROC gl_BindBuffer; +PFNGLBUFFERDATAPROC gl_BufferData; +PFNGLCREATESHADERPROC gl_CreateShader; +PFNGLSHADERSOURCEPROC gl_ShaderSource; +PFNGLCOMPILESHADERPROC gl_CompileShader; +PFNGLCREATEPROGRAMPROC gl_CreateProgram; +PFNGLATTACHSHADERPROC gl_AttachShader; +PFNGLLINKPROGRAMPROC gl_LinkProgram; +PFNGLUSEPROGRAMPROC gl_UseProgram; +PFNGLGETSHADERIVPROC gl_GetShaderiv; +PFNGLGETSHADERINFOLOGPROC gl_GetShaderInfoLog; +PFNGLGETPROGRAMIVPROC gl_GetProgramiv; +PFNGLGETPROGRAMINFOLOGPROC gl_GetProgramInfoLog; +PFNGLGETATTRIBLOCATIONPROC gl_GetAttribLocation; +PFNGLVERTEXATTRIBPOINTERPROC gl_VertexAttribPointer; +PFNGLENABLEVERTEXATTRIBARRAYPROC gl_EnableVertexAttribArray; +PFNGLGETUNIFORMLOCATIONPROC gl_GetUniformLocation; +PFNGLUNIFORMMATRIX4FVPROC gl_UniformMatrix4fv; void initExtensionEntries(void) { -- 1.7.10.4