From b814be9814d85b01824d4aae607250b00a489ccf Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Thu, 11 Aug 2005 10:57:47 +0000
Subject: [PATCH] Fix gcc 4.0 warnings.

---
 dlls/ddraw/device_opengl.c | 16 ++++++++--------
 dlls/wined3d/directx.c     |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/ddraw/device_opengl.c b/dlls/ddraw/device_opengl.c
index e0ebbf15734..20fc13553b0 100644
--- a/dlls/ddraw/device_opengl.c
+++ b/dlls/ddraw/device_opengl.c
@@ -4411,12 +4411,12 @@ d3ddevice_init_at_startup(void *gl_handle)
 	    glGetIntegerv(GL_MAX_TEXTURE_UNITS_WINE, &(GL_extensions.max_texture_units));
 	    TRACE(" - multi-texturing (%d stages)\n", GL_extensions.max_texture_units);
 	    /* We query the ARB version to be the most portable we can... */
-	    GL_extensions.glActiveTexture = pglXGetProcAddressARB("glActiveTextureARB");
-	    GL_extensions.glMultiTexCoord[0] = pglXGetProcAddressARB("glMultiTexCoord1fvARB");
-	    GL_extensions.glMultiTexCoord[1] = pglXGetProcAddressARB("glMultiTexCoord2fvARB");
-	    GL_extensions.glMultiTexCoord[2] = pglXGetProcAddressARB("glMultiTexCoord3fvARB");
-	    GL_extensions.glMultiTexCoord[3] = pglXGetProcAddressARB("glMultiTexCoord4fvARB");
-	    GL_extensions.glClientActiveTexture = pglXGetProcAddressARB("glClientActiveTextureARB");
+	    GL_extensions.glActiveTexture = pglXGetProcAddressARB( (const GLubyte *) "glActiveTextureARB");
+	    GL_extensions.glMultiTexCoord[0] = pglXGetProcAddressARB( (const GLubyte *) "glMultiTexCoord1fvARB");
+	    GL_extensions.glMultiTexCoord[1] = pglXGetProcAddressARB( (const GLubyte *) "glMultiTexCoord2fvARB");
+	    GL_extensions.glMultiTexCoord[2] = pglXGetProcAddressARB( (const GLubyte *) "glMultiTexCoord3fvARB");
+	    GL_extensions.glMultiTexCoord[3] = pglXGetProcAddressARB( (const GLubyte *) "glMultiTexCoord4fvARB");
+	    GL_extensions.glClientActiveTexture = pglXGetProcAddressARB( (const GLubyte *) "glClientActiveTextureARB");
 	} else {
 	    GL_extensions.max_texture_units = 0;
 	}
@@ -4424,8 +4424,8 @@ d3ddevice_init_at_startup(void *gl_handle)
 	if (strstr(glExtensions, "GL_EXT_texture_compression_s3tc")) {
 	    TRACE(" - S3TC compression supported\n");
 	    GL_extensions.s3tc_compressed_texture = TRUE;
-	    GL_extensions.glCompressedTexImage2D = pglXGetProcAddressARB("glCompressedTexImage2DARB");
-	    GL_extensions.glCompressedTexSubImage2D = pglXGetProcAddressARB("glCompressedTexSubImage2DARB");
+	    GL_extensions.glCompressedTexImage2D = pglXGetProcAddressARB( (const GLubyte *) "glCompressedTexImage2DARB");
+	    GL_extensions.glCompressedTexSubImage2D = pglXGetProcAddressARB( (const GLubyte *) "glCompressedTexSubImage2DARB");
 	}
     }
     
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 4e157382ec6..8ae5660f342 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -235,7 +235,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
         gl_string = glXGetClientString(display, GLX_VENDOR);
     } else {
         FIXME("Display must not be NULL, use glXGetCurrentDisplay or getAdapterDisplay()\n");
-        gl_string = glGetString(GL_VENDOR);
+        gl_string = (const char *) glGetString(GL_VENDOR);
     }
     TRACE_(d3d_caps)("Filling vendor string %s\n", gl_string);
     if (gl_string != NULL) {
@@ -255,7 +255,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
     TRACE_(d3d_caps)("found GL_VENDOR (%s)->(0x%04x)\n", debugstr_a(gl_string), gl_info->gl_vendor);
 
     /* Parse the GL_VERSION field into major and minor information */
-    gl_string = glGetString(GL_VERSION);
+    gl_string = (const char *) glGetString(GL_VERSION);
     if (gl_string != NULL) {
 
         switch (gl_info->gl_vendor) {
@@ -324,7 +324,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
         TRACE_(d3d_caps)("found GL_VERSION  (%s)->(0x%08lx)\n", debugstr_a(gl_string), gl_info->gl_driver_version);
 
         /* Fill in the renderer information */
-        gl_string = glGetString(GL_RENDERER);
+        gl_string = (const char *) glGetString(GL_RENDERER);
         strcpy(gl_info->gl_renderer, gl_string);
 
         switch (gl_info->gl_vendor) {
@@ -393,7 +393,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display)
     TRACE_(d3d_caps)("Maximum point size support - max texture size=%f\n", gl_float);
 
     /* Parse the gl supported features, in theory enabling parts of our code appropriately */
-    GL_Extensions = glGetString(GL_EXTENSIONS);
+    GL_Extensions = (const char *) glGetString(GL_EXTENSIONS);
     TRACE_(d3d_caps)("GL_Extensions reported:\n");
 
     if (NULL == GL_Extensions) {