Merge branch 'ext-provoking-vertex'

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

diff --git a/src/glut/glx/glut_winmisc.c b/src/glut/glx/glut_winmisc.c
index 5a9d199a56e560f2e00f4ab13cd17e4d0fde7b63..0fc4c805f200570c00249862ae40be43cab9c96d 100644 (file)
--- a/src/glut/glx/glut_winmisc.c
+++ b/src/glut/glx/glut_winmisc.c
@@ -5,6 +5,10 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -19,7 +23,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSetWindowTitle(const char *title)
 {
   XTextProperty textprop;
@@ -35,7 +39,7 @@ glutSetWindowTitle(const char *title)
   XFlush(__glutDisplay);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSetIconTitle(const char *title)
 {
   XTextProperty textprop;
@@ -51,7 +55,7 @@ glutSetIconTitle(const char *title)
   XFlush(__glutDisplay);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutPositionWindow(int x, int y)
 {
   IGNORE_IN_GAME_MODE();
@@ -61,7 +65,7 @@ glutPositionWindow(int x, int y)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutReshapeWindow(int w, int h)
 {
   IGNORE_IN_GAME_MODE();
@@ -74,7 +78,7 @@ glutReshapeWindow(int w, int h)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutPopWindow(void)
 {
   IGNORE_IN_GAME_MODE();
@@ -83,7 +87,7 @@ glutPopWindow(void)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutPushWindow(void)
 {
   IGNORE_IN_GAME_MODE();
@@ -92,7 +96,7 @@ glutPushWindow(void)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutIconifyWindow(void)
 {
   IGNORE_IN_GAME_MODE();
@@ -101,7 +105,7 @@ glutIconifyWindow(void)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_MAP_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutShowWindow(void)
 {
   IGNORE_IN_GAME_MODE();
@@ -109,7 +113,7 @@ glutShowWindow(void)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_MAP_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutHideWindow(void)
 {
   IGNORE_IN_GAME_MODE();