diff options
| author | Brice Goglin <[email protected]> | 2008-06-10 22:48:43 +0200 |
|---|---|---|
| committer | Brice Goglin <[email protected]> | 2008-06-10 22:48:43 +0200 |
| commit | 2d0ca23319ca1df4a9b099a9d3c13ae4bea9b37b (patch) | |
| tree | 49bfd8344bdad21f8783ff76ff4b5906502c7d56 /src/glu | |
| parent | 59c9c40c010ac815668ee4c411003f93aeff857d (diff) | |
| parent | 6f4c8b5b5047c6ff6273e3acc98c7ec504bb0e21 (diff) | |
Merge branch 'mesa_7_0_branch' of git://git.freedesktop.org/git/mesa/mesa into debian-unstable
Diffstat (limited to 'src/glu')
| -rw-r--r-- | src/glu/sgi/libutil/mipmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glu/sgi/libutil/mipmap.c b/src/glu/sgi/libutil/mipmap.c index 44f519a4e21..d65b7f689f5 100644 --- a/src/glu/sgi/libutil/mipmap.c +++ b/src/glu/sgi/libutil/mipmap.c @@ -6627,7 +6627,7 @@ typedef void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level, static TexImage3Dproc pTexImage3D = 0; -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(__WIN32__) # include <dlfcn.h> # include <sys/types.h> #else @@ -6642,7 +6642,7 @@ static void gluTexImage3D( GLenum target, GLint level, const GLvoid *pixels ) { if (!pTexImage3D) { -#ifdef _WIN32 +#if defined(_WIN32) || defined(__WIN32__) pTexImage3D = (TexImage3Dproc) wglGetProcAddress("glTexImage3D"); if (!pTexImage3D) pTexImage3D = (TexImage3Dproc) wglGetProcAddress("glTexImage3DEXT"); |