diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-04-16 20:25:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-04-16 20:25:08 +1000 |
| commit | 09df5eaff2ba2694b82d1211fd24410cb2997e25 (patch) | |
| tree | 0028ffd43d1895bb9e7d1ab0f5906629b0fa4825 /src/glu/sgi | |
| parent | 9566cf0e2f326d8fe638748d0bc10626e8c0387e (diff) | |
| parent | b64448b3e4026d3f11f366515b7544a6581403f3 (diff) | |
Merge branch 'master' into r500test
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_ioctl.c
Diffstat (limited to 'src/glu/sgi')
| -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 44f519a4e2..d65b7f689f 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"); |