From 57a879849643e79d9674198a3a77c59532fb79b4 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 28 Apr 2011 07:58:00 +0000
Subject: xserver xkeyboard-config mesa git update 28 Apr 2011

---
 mesalib/src/glu/sgi/include/gluos.h  | 4 ++++
 mesalib/src/glu/sgi/libutil/mipmap.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'mesalib/src/glu')

diff --git a/mesalib/src/glu/sgi/include/gluos.h b/mesalib/src/glu/sgi/include/gluos.h
index 802aa8402..ac0a7874c 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 415dfaa54..c475c96a2 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,
-- 
cgit v1.2.3