summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-09-11 16:39:04 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-09-11 16:39:04 +0000
commitbd38df11f43d726d2df3ad0b66b6962e08cfe1d1 (patch)
treecf70929efa55c378e59db9e0a880baf64ec3b52f /src
parent31a66ada72e5d9eb728f5149b72121bb04776016 (diff)
Win32 fixes (SF bug 1554931)
Diffstat (limited to 'src')
-rw-r--r--src/glu/sgi/libutil/mipmap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glu/sgi/libutil/mipmap.c b/src/glu/sgi/libutil/mipmap.c
index ea17438dd6..3e45f80871 100644
--- 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");