summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@freedesktop.org>2010-09-27 07:26:44 -0700
committerIan Romanick <idr@freedesktop.org>2010-10-02 14:58:26 -0700
commit3afaa0c43394055b05f3c7b2f4cef0ebbb876d0a (patch)
treebf491036ac0952adb100251f907127e41b46809b
parent8cc549346c62764428667cabac0544682843b0dd (diff)
Fix numerous GCC pointer signedness warnings
-rw-r--r--src/shader.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/shader.c b/src/shader.c
index e43c92b..0ef72f7 100644
--- a/src/shader.c
+++ b/src/shader.c
@@ -32,7 +32,7 @@
#if defined(HAVE_GLX)
#include <GL/glx.h>
-#define GetProcAddress(x) glXGetProcAddress(#x)
+#define GetProcAddress(x) glXGetProcAddress((const GLubyte *) #x)
#elif defined(HAVE_EGL)
#include <EGL/egl.h>
#define GetProcAddress(x) eglGetProcAddress(#x)
@@ -63,7 +63,8 @@ gluInitializeCompiler(void)
* This will either be from OpenGL 2.0+ (or OpenGL ES 2.0) or from
* GL_ARB_shader_objects.
*/
- const char *const version_string = glGetString(GL_VERSION);
+ const char *const version_string =
+ (const char *) glGetString(GL_VERSION);
float version = strtof(version_string, NULL);
if (version >= 2.0f) {
@@ -91,7 +92,8 @@ gluInitializeCompiler(void)
GetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)
GetProcAddress(glGetProgramInfoLog);
} else {
- const char *const extension_string = glGetString(GL_EXTENSIONS);
+ const char *const extension_string =
+ (const char *) glGetString(GL_EXTENSIONS);
const size_t len = strlen("GL_ARB_shader_objects");
const char *x;