Win32 fixes (SF bug 1554931)

diff --git a/src/glu/sgi/libutil/mipmap.c b/src/glu/sgi/libutil/mipmap.c
index ea17438dd6374bbd651ed4c2a1f4eb03edc97407..3e45f808714d5e022c0ae1c2d27209d62d8ebeb4 100644 (file)
--- a/src/glu/sgi/libutil/mipmap.c
+++ b/src/glu/sgi/libutil/mipmap.c
@@ -6590,16 +6590,16 @@ static void halve1DimagePackedPixel(int components,
  * Contributed by Gerk Huisma <gerk@five-d.demon.nl>.
  */
 
-typedef GLAPI void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level,
+typedef void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level,
                                                 GLenum internalFormat,
                                                 GLsizei width, GLsizei height,
                                                 GLsizei depth, GLint border,
                                                 GLenum format, GLenum type,
                                                 const GLvoid *pixels );
 
-static TexImage3Dproc pTexImage3D;
+GLAPI TexImage3Dproc pTexImage3D;
 
-#ifndef WIN32
+#ifndef _WIN32
 #  include <dlfcn.h>
 #  include <sys/types.h>
 #else
@@ -6614,7 +6614,7 @@ static void gluTexImage3D( GLenum target, GLint level,
                           const GLvoid *pixels )
 {
    if (!pTexImage3D) {
-#ifdef WIN32
+#ifdef _WIN32
       pTexImage3D = (TexImage3Dproc) wglGetProcAddress("glTexImage3D");
       if (!pTexImage3D)
         pTexImage3D = (TexImage3Dproc) wglGetProcAddress("glTexImage3DEXT");