From e21c970d96848358a8a60b6b95ce43cac34c0ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 27 Apr 2011 19:05:29 +0100 Subject: sgi: Fix MSVC build. Including windows.h was ineffective on MSVC because we define the NOGDI macro, which skips the wingdi.h include. Unsetting NOGDI is also a bad idea because it causes all sort of symbol clashes with SGI code. The real problem is that WINGDAPI was not being defined, also due to NOGDI, so simply define it to blank if not done already. This seems to make everybody happy. --- src/include/gluos.h | 4 ++++ src/libutil/mipmap.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/include/gluos.h b/src/include/gluos.h index 802aa84..ac0a787 100644 --- a/src/include/gluos.h +++ b/src/include/gluos.h @@ -60,6 +60,10 @@ #pragma comment(linker, "/OPT:NOWIN98") #endif +#ifndef WINGDIAPI +#define WINGDIAPI +#endif + #elif defined(__OS2__) #include diff --git a/src/libutil/mipmap.c b/src/libutil/mipmap.c index 415dfaa..c475c96 100644 --- a/src/libutil/mipmap.c +++ b/src/libutil/mipmap.c @@ -6631,7 +6631,7 @@ static TexImage3Dproc pTexImage3D = 0; # include # include #else -# include + WINGDIAPI PROC WINAPI wglGetProcAddress(LPCSTR); #endif static void gluTexImage3D( GLenum target, GLint level, -- cgit v1.2.1