glx: We no longer need screen extensions for drisw

[mesa.git] / src / glut / glx / glut_joy.c

diff --git a/src/glut/glx/glut_joy.c b/src/glut/glx/glut_joy.c
index a6f54f4a6a1a536c9a01f3925c70707daa4407fe..5025607922c2115b0f3243891239bbf18df77cc1 100644 (file)
--- a/src/glut/glx/glut_joy.c
+++ b/src/glut/glx/glut_joy.c
@@ -6,8 +6,11 @@
    implied. This program is -not- in the public domain. */
 
 #ifdef _WIN32
+#ifdef __MINGW32__
+#include <GL/gl.h>
+#endif
 #include <windows.h>
-#ifndef __CYGWIN32
+#ifndef __CYGWIN32__
 #include <mmsystem.h>  /* Win32 Multimedia API header. */
 #endif
 #endif
@@ -15,7 +18,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutJoystickFunc(GLUTjoystickCB joystickFunc, int pollInterval)
 {
 #ifdef _WIN32
@@ -48,7 +51,7 @@ glutJoystickFunc(GLUTjoystickCB joystickFunc, int pollInterval)
 #endif
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutForceJoystickFunc(void)
 {
 #ifdef _WIN32