dri: Rework planar image interface

[mesa.git] / include / GL / glu.h

diff --git a/include/GL/glu.h b/include/GL/glu.h
index 3cd1113509f52c5734e6c5ac93d61f84372c8a1e..ba2228d8d86ab38f604c948bee2e73883972d979 100644 (file)
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@@ -38,8 +38,12 @@
 #include <GL/gl.h>
 
 #ifndef GLAPIENTRY
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define GLAPIENTRY __stdcall
+#else
 #define GLAPIENTRY
 #endif
+#endif
 
 #ifndef GLAPIENTRYP
 #define GLAPIENTRYP GLAPIENTRY *
@@ -280,7 +284,7 @@ typedef GLUtesselator GLUtriangulatorObj;
 #define GLU_TESS_MAX_COORD 1.0e150
 
 /* Internal convenience typedefs */
-typedef void (GLAPIENTRYP _GLUfuncptr)();
+typedef void (GLAPIENTRYP _GLUfuncptr)(void);
 
 GLAPI void GLAPIENTRY gluBeginCurve (GLUnurbs* nurb);
 GLAPI void GLAPIENTRY gluBeginPolygon (GLUtesselator* tess);