diff options
| -rw-r--r-- | src/include/gluos.h | 6 | ||||
| -rw-r--r-- | src/libutil/mipmap.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/include/gluos.h b/src/include/gluos.h index 8eaa7a1..802aa84 100644 --- a/src/include/gluos.h +++ b/src/include/gluos.h @@ -40,7 +40,9 @@ #define NOIME #define NOMINMAX -#define _WIN32_WINNT 0x0400 +#ifndef _WIN32_WINNT + #define _WIN32_WINNT 0x0400 +#endif #ifndef STRICT #define STRICT 1 #endif @@ -48,9 +50,11 @@ #include <windows.h> /* Disable warnings */ +#if defined(_MSC_VER) #pragma warning(disable : 4101) #pragma warning(disable : 4244) #pragma warning(disable : 4761) +#endif #if defined(_MSC_VER) && _MSC_VER >= 1200 && _MSC_VER < 1300 #pragma comment(linker, "/OPT:NOWIN98") diff --git a/src/libutil/mipmap.c b/src/libutil/mipmap.c index 026ab84..71e76af 100644 --- a/src/libutil/mipmap.c +++ b/src/libutil/mipmap.c @@ -6631,7 +6631,7 @@ static TexImage3Dproc pTexImage3D = 0; # include <dlfcn.h> # include <sys/types.h> #else - WINGDIAPI PROC WINAPI wglGetProcAddress(LPCSTR); +# include <windows.h> #endif static void gluTexImage3D( GLenum target, GLint level, |