aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glu/sgi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-28 11:14:32 +0000
committermarha <marha@users.sourceforge.net>2011-04-28 11:14:32 +0000
commit1840c5631682e0a69ed11487a23a43d45f2d15e1 (patch)
treefe954636044c0057b9f08e76d19489493ff09745 /mesalib/src/glu/sgi
parent2ab09dc03e4ecc726ee7b5528306b0fe3e5b1837 (diff)
parent57a879849643e79d9674198a3a77c59532fb79b4 (diff)
downloadvcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.tar.gz
vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.tar.bz2
vcxsrv-1840c5631682e0a69ed11487a23a43d45f2d15e1.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glu/sgi')
-rw-r--r--mesalib/src/glu/sgi/include/gluos.h4
-rw-r--r--mesalib/src/glu/sgi/libutil/mipmap.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/src/glu/sgi/include/gluos.h b/mesalib/src/glu/sgi/include/gluos.h
index e22e6721e..6e1691022 100644
--- a/mesalib/src/glu/sgi/include/gluos.h
+++ b/mesalib/src/glu/sgi/include/gluos.h
@@ -60,6 +60,10 @@
#pragma comment(linker, "/OPT:NOWIN98")
#endif
+#ifndef WINGDIAPI
+#define WINGDIAPI
+#endif
+
#elif defined(__OS2__)
#include <stdlib.h>
diff --git a/mesalib/src/glu/sgi/libutil/mipmap.c b/mesalib/src/glu/sgi/libutil/mipmap.c
index a156a963d..3ba3667ae 100644
--- a/mesalib/src/glu/sgi/libutil/mipmap.c
+++ b/mesalib/src/glu/sgi/libutil/mipmap.c
@@ -6631,7 +6631,7 @@ static TexImage3Dproc pTexImage3D = 0;
# include <dlfcn.h>
# include <sys/types.h>
#else
-# include <windows.h>
+ WINGDIAPI PROC WINAPI wglGetProcAddress(LPCSTR);
#endif
static void gluTexImage3D( GLenum target, GLint level,