From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 12 Feb 2003 23:56:21 +0000 (+0000)
Subject: replace APIENTRY with GLUTAPIENTRY to be consistant with glut.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f2f5f4f8842b984d58f8a24f0a6c3c150f53baad;p=mesa.git

replace APIENTRY with GLUTAPIENTRY to be consistant with glut.h
---

diff --git a/src/glut/glx/glut_bitmap.c b/src/glut/glx/glut_bitmap.c
index f1afdd7a046..f471167810e 100644
--- a/src/glut/glx/glut_bitmap.c
+++ b/src/glut/glx/glut_bitmap.c
@@ -8,7 +8,7 @@
 #include "glutint.h"
 #include "glutbitmap.h"
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutBitmapCharacter(GLUTbitmapFont font, int c)
 {
   const BitmapCharRec *ch;
diff --git a/src/glut/glx/glut_bwidth.c b/src/glut/glx/glut_bwidth.c
index bee5e8827ea..34776f8b0f3 100644
--- a/src/glut/glx/glut_bwidth.c
+++ b/src/glut/glx/glut_bwidth.c
@@ -9,7 +9,7 @@
 #include "glutbitmap.h"
 
 /* CENTRY */
-int APIENTRY 
+int GLUTAPIENTRY 
 glutBitmapWidth(GLUTbitmapFont font, int c)
 {
   BitmapFontPtr fontinfo;
@@ -30,7 +30,7 @@ glutBitmapWidth(GLUTbitmapFont font, int c)
     return 0;
 }
 
-int APIENTRY 
+int GLUTAPIENTRY 
 glutBitmapLength(GLUTbitmapFont font, const unsigned char *string)
 {
   int c, length;
diff --git a/src/glut/glx/glut_cindex.c b/src/glut/glx/glut_cindex.c
index c47b21ea796..d0c12bf3a06 100644
--- a/src/glut/glx/glut_cindex.c
+++ b/src/glut/glx/glut_cindex.c
@@ -11,7 +11,7 @@
 #define CLAMP(i) ((i) > 1.0 ? 1.0 : ((i) < 0.0 ? 0.0 : (i)))
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutSetColor(int ndx, GLfloat red, GLfloat green, GLfloat blue)
 {
   GLUTcolormap *cmap, *newcmap;
@@ -126,7 +126,7 @@ glutSetColor(int ndx, GLfloat red, GLfloat green, GLfloat blue)
   XStoreColor(__glutDisplay, cmap->cmap, &color);
 }
 
-GLfloat APIENTRY
+GLfloat GLUTAPIENTRY
 glutGetColor(int ndx, int comp)
 {
   GLUTcolormap *colormap;
@@ -161,7 +161,7 @@ glutGetColor(int ndx, int comp)
   return colormap->cells[ndx].component[comp];
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutCopyColormap(int winnum)
 {
   GLUTwindow *window = __glutWindowList[winnum - 1];
diff --git a/src/glut/glx/glut_cursor.c b/src/glut/glx/glut_cursor.c
index c0a5a5b7afc..ff5c89f8868 100644
--- a/src/glut/glx/glut_cursor.c
+++ b/src/glut/glx/glut_cursor.c
@@ -180,7 +180,7 @@ __glutSetCursor(GLUTwindow *window)
 }
 
 /* CENTRY */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSetCursor(int cursor)
 {
 #ifdef _WIN32
diff --git a/src/glut/glx/glut_dials.c b/src/glut/glx/glut_dials.c
index 3eea850c5bd..e015b91bc42 100644
--- a/src/glut/glx/glut_dials.c
+++ b/src/glut/glx/glut_dials.c
@@ -7,7 +7,7 @@
 
 #include "glutint.h"
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutButtonBoxFunc(GLUTbuttonBoxCB buttonBoxFunc)
 {
   __glutCurrentWindow->buttonBox = buttonBoxFunc;
@@ -16,7 +16,7 @@ glutButtonBoxFunc(GLUTbuttonBoxCB buttonBoxFunc)
     GLUT_DEVICE_MASK_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutDialsFunc(GLUTdialsCB dialsFunc)
 {
   __glutCurrentWindow->dials = dialsFunc;
diff --git a/src/glut/glx/glut_dstr.c b/src/glut/glx/glut_dstr.c
index 3f7dba80f35..981e88ffa44 100644
--- a/src/glut/glx/glut_dstr.c
+++ b/src/glut/glx/glut_dstr.c
@@ -1478,7 +1478,7 @@ getVisualInfoFromString(char *string, Bool * treatAsSingle,
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutInitDisplayString(const char *string)
 {
 #ifdef _WIN32
diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c
index d2c2c4810ff..0b65cf3039a 100644
--- a/src/glut/glx/glut_event.c
+++ b/src/glut/glx/glut_event.c
@@ -103,13 +103,13 @@ Atom __glutMotifHints = None;
 unsigned int __glutModifierMask = (unsigned int) ~0;
 int __glutWindowDamaged = 0;
 
-void APIENTRY
+void GLUTAPIENTRY
 glutIdleFunc(GLUTidleCB idleFunc)
 {
   __glutIdleFunc = idleFunc;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutTimerFunc(unsigned int interval, GLUTtimerCB timerFunc, int value)
 {
   GLUTtimer *timer, *other;
@@ -215,7 +215,7 @@ __glutPostRedisplay(GLUTwindow * window, int layerMask)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutPostRedisplay(void)
 {
   __glutPostRedisplay(__glutCurrentWindow, GLUT_REDISPLAY_WORK);
@@ -225,7 +225,7 @@ glutPostRedisplay(void)
    glutSetWindow call (entailing an expensive OpenGL context switch),
    particularly useful when multiple windows need redisplays posted at
    the same times.  See also glutPostWindowOverlayRedisplay. */
-void APIENTRY
+void GLUTAPIENTRY
 glutPostWindowRedisplay(int win)
 {
   __glutPostRedisplay(__glutWindowList[win - 1], GLUT_REDISPLAY_WORK);
@@ -1351,7 +1351,7 @@ __glutProcessWindowWorkLists(void)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutMainLoop(void)
 {
 #if !defined(_WIN32)
diff --git a/src/glut/glx/glut_ext.c b/src/glut/glx/glut_ext.c
index cfbc31a460f..a7a56fbef8d 100644
--- a/src/glut/glx/glut_ext.c
+++ b/src/glut/glx/glut_ext.c
@@ -11,7 +11,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-int APIENTRY 
+int GLUTAPIENTRY 
 glutExtensionSupported(const char *extension)
 {
   static const GLubyte *extensions = NULL;
@@ -177,7 +177,7 @@ static struct name_address_pair glut_functions[] = {
 
 
 /* XXX This isn't an official GLUT function, yet */
-void * APIENTRY 
+void * GLUTAPIENTRY 
 glutGetProcAddress(const char *procName)
 {
    /* Try GLUT functions first */
diff --git a/src/glut/glx/glut_fbc.c b/src/glut/glx/glut_fbc.c
index e93188b8622..deb46c3d8db 100644
--- a/src/glut/glx/glut_fbc.c
+++ b/src/glut/glx/glut_fbc.c
@@ -18,7 +18,7 @@
 
 /* Set a Fortran callback function. */
 
-void APIENTRY
+void GLUTAPIENTRY
 __glutSetFCB(int which, void *func)
 {
 #ifdef SUPPORT_FORTRAN
@@ -100,7 +100,7 @@ __glutSetFCB(int which, void *func)
 
 /* Get a Fortran callback function. */
 
-void* APIENTRY
+void* GLUTAPIENTRY
 __glutGetFCB(int which)
 {
 #ifdef SUPPORT_FORTRAN
diff --git a/src/glut/glx/glut_fullscrn.c b/src/glut/glx/glut_fullscrn.c
index 0f1ea10b1be..aab3b487638 100644
--- a/src/glut/glx/glut_fullscrn.c
+++ b/src/glut/glx/glut_fullscrn.c
@@ -28,7 +28,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutFullScreen(void)
 {
   assert(!__glutCurrentWindow->parent);
diff --git a/src/glut/glx/glut_gamemode.c b/src/glut/glx/glut_gamemode.c
index fc9131fb306..3ffeafee57f 100644
--- a/src/glut/glx/glut_gamemode.c
+++ b/src/glut/glx/glut_gamemode.c
@@ -59,7 +59,7 @@ __glutCloseDownGameMode(void)
   __glutGameModeWindow = NULL;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutLeaveGameMode(void)
 {
   if (__glutGameModeWindow == NULL) {
@@ -548,7 +548,7 @@ parseDisplayString(const char *display, int *ncriteria)
   return criteria;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutGameModeString(const char *string)
 {
   Criterion *criteria;
@@ -560,7 +560,7 @@ glutGameModeString(const char *string)
   free(criteria);
 }
 
-int APIENTRY
+int GLUTAPIENTRY
 glutEnterGameMode(void)
 {
   GLUTwindow *window;
@@ -654,7 +654,7 @@ glutEnterGameMode(void)
   return window->num + 1;
 }
 
-int APIENTRY
+int GLUTAPIENTRY
 glutGameModeGet(GLenum mode)
 {
   switch (mode) {
diff --git a/src/glut/glx/glut_get.c b/src/glut/glx/glut_get.c
index ecfd981ad9f..9c1ca6caaea 100644
--- a/src/glut/glx/glut_get.c
+++ b/src/glut/glx/glut_get.c
@@ -10,7 +10,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-int APIENTRY 
+int GLUTAPIENTRY 
 glutGet(GLenum param)
 {
   Window win, root;
diff --git a/src/glut/glx/glut_init.c b/src/glut/glx/glut_init.c
index d814479db0d..b1a42a328dc 100644
--- a/src/glut/glx/glut_init.c
+++ b/src/glut/glx/glut_init.c
@@ -186,7 +186,7 @@ removeArgs(int *argcp, char **argv, int numToRemove)
   *argcp -= numToRemove;
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutInit(int *argcp, char **argv)
 {
   char *display = NULL;
@@ -344,7 +344,7 @@ glutInit(int *argcp, char **argv)
 }
 
 #ifdef _WIN32
-void APIENTRY 
+void GLUTAPIENTRY 
 __glutInitWithExit(int *argcp, char **argv, void (__cdecl *exitfunc)(int))
 {
   __glutExitFunc = exitfunc;
@@ -353,7 +353,7 @@ __glutInitWithExit(int *argcp, char **argv, void (__cdecl *exitfunc)(int))
 #endif
 
 /* CENTRY */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutInitWindowPosition(int x, int y)
 {
   __glutInitX = x;
@@ -367,7 +367,7 @@ glutInitWindowPosition(int x, int y)
   }
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutInitWindowSize(int width, int height)
 {
   __glutInitWidth = width;
@@ -381,7 +381,7 @@ glutInitWindowSize(int width, int height)
   }
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutInitDisplayMode(unsigned int mask)
 {
   __glutDisplayMode = mask;
diff --git a/src/glut/glx/glut_input.c b/src/glut/glx/glut_input.c
index 6f6f41f1d65..add3df7c3fd 100644
--- a/src/glut/glx/glut_input.c
+++ b/src/glut/glx/glut_input.c
@@ -581,7 +581,7 @@ __glutUpdateInputDeviceMask(GLUTwindow * window)
 }
 
 /* CENTRY */
-int APIENTRY
+int GLUTAPIENTRY
 glutDeviceGet(GLenum param)
 {
   probeDevices();
diff --git a/src/glut/glx/glut_joy.c b/src/glut/glx/glut_joy.c
index 116f0328448..a4528ae1ce4 100644
--- a/src/glut/glx/glut_joy.c
+++ b/src/glut/glx/glut_joy.c
@@ -15,7 +15,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutJoystickFunc(GLUTjoystickCB joystickFunc, int pollInterval)
 {
 #ifdef _WIN32
@@ -48,7 +48,7 @@ glutJoystickFunc(GLUTjoystickCB joystickFunc, int pollInterval)
 #endif
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutForceJoystickFunc(void)
 {
 #ifdef _WIN32
diff --git a/src/glut/glx/glut_key.c b/src/glut/glx/glut_key.c
index 0927f66e561..3e1f7e52c1b 100644
--- a/src/glut/glx/glut_key.c
+++ b/src/glut/glx/glut_key.c
@@ -10,7 +10,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutKeyboardFunc(GLUTkeyboardCB keyboardFunc)
 {
   __glutChangeWindowEventMask(KeyPressMask,
@@ -18,7 +18,7 @@ glutKeyboardFunc(GLUTkeyboardCB keyboardFunc)
   __glutCurrentWindow->keyboard = keyboardFunc;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSpecialFunc(GLUTspecialCB specialFunc)
 {
   __glutChangeWindowEventMask(KeyPressMask,
diff --git a/src/glut/glx/glut_keyctrl.c b/src/glut/glx/glut_keyctrl.c
index a4bc0210b7b..c76912e100a 100644
--- a/src/glut/glx/glut_keyctrl.c
+++ b/src/glut/glx/glut_keyctrl.c
@@ -8,13 +8,13 @@
 #include "glutint.h"
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutIgnoreKeyRepeat(int ignore)
 {
   __glutCurrentWindow->ignoreKeyRepeat = ignore;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSetKeyRepeat(int repeatMode)
 {
 #if !defined(_WIN32)
diff --git a/src/glut/glx/glut_keyup.c b/src/glut/glx/glut_keyup.c
index 1c6e78051d6..ae97b2f967f 100644
--- a/src/glut/glx/glut_keyup.c
+++ b/src/glut/glx/glut_keyup.c
@@ -10,7 +10,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutKeyboardUpFunc(GLUTkeyboardCB keyboardUpFunc)
 {
   __glutChangeWindowEventMask(KeyReleaseMask,
@@ -18,7 +18,7 @@ glutKeyboardUpFunc(GLUTkeyboardCB keyboardUpFunc)
   __glutCurrentWindow->keyboardUp = keyboardUpFunc;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSpecialUpFunc(GLUTspecialCB specialUpFunc)
 {
   __glutChangeWindowEventMask(KeyReleaseMask,
diff --git a/src/glut/glx/glut_menu.c b/src/glut/glx/glut_menu.c
index 94ac5167b6d..4e2cac27959 100644
--- a/src/glut/glx/glut_menu.c
+++ b/src/glut/glx/glut_menu.c
@@ -831,7 +831,7 @@ installMenuCallbacks(void)
   __glutGetMenuItem = getMenuItem;
 }
 
-int APIENTRY 
+int GLUTAPIENTRY 
 glutCreateMenu(GLUTselectCB selectFunc)
 {
   XSetWindowAttributes wa;
@@ -890,7 +890,7 @@ glutCreateMenu(GLUTselectCB selectFunc)
 }
 
 /* CENTRY */
-int APIENTRY 
+int GLUTAPIENTRY 
 glutGetMenu(void)
 {
   if (__glutCurrentMenu) {
@@ -900,7 +900,7 @@ glutGetMenu(void)
   }
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSetMenu(int menuid)
 {
   GLUTmenu *menu;
@@ -940,7 +940,7 @@ __glutSetMenuItem(GLUTmenuItem * item, const char *label,
 }
 
 /* CENTRY */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutAddMenuEntry(const char *label, int value)
 {
   XSetWindowAttributes wa;
@@ -968,7 +968,7 @@ glutAddMenuEntry(const char *label, int value)
   __glutCurrentMenu->list = entry;
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutAddSubMenu(const char *label, int menu)
 {
   XSetWindowAttributes wa;
@@ -997,7 +997,7 @@ glutAddSubMenu(const char *label, int menu)
   __glutCurrentMenu->list = submenu;
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutAttachMenu(int button)
 {
   if (__glutMappedMenu) {
diff --git a/src/glut/glx/glut_menu2.c b/src/glut/glx/glut_menu2.c
index d02cee4ac15..969b8120b44 100644
--- a/src/glut/glx/glut_menu2.c
+++ b/src/glut/glx/glut_menu2.c
@@ -29,19 +29,19 @@
 
 /* CENTRY */
 /* DEPRICATED, use glutMenuStatusFunc instead. */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutMenuStateFunc(GLUTmenuStateCB menuStateFunc)
 {
   __glutMenuStatusFunc = (GLUTmenuStatusCB) menuStateFunc;
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutMenuStatusFunc(GLUTmenuStatusCB menuStatusFunc)
 {
   __glutMenuStatusFunc = menuStatusFunc;
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutDestroyMenu(int menunum)
 {
   GLUTmenu *menu = __glutGetMenuByNum(menunum);
@@ -68,7 +68,7 @@ glutDestroyMenu(int menunum)
   free(menu);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutChangeToMenuEntry(int num, const char *label, int value)
 {
   GLUTmenuItem *item;
@@ -95,7 +95,7 @@ glutChangeToMenuEntry(int num, const char *label, int value)
   __glutWarning("Current menu has no %d item.", num);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutChangeToSubMenu(int num, const char *label, int menu)
 {
   GLUTmenuItem *item;
@@ -122,7 +122,7 @@ glutChangeToSubMenu(int num, const char *label, int menu)
   __glutWarning("Current menu has no %d item.", num);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutRemoveMenuItem(int num)
 {
   GLUTmenuItem *item, **prev, *remaining;
@@ -173,7 +173,7 @@ glutRemoveMenuItem(int num)
   __glutWarning("Current menu has no %d item.", num);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutDetachMenu(int button)
 {
   if (__glutMappedMenu)
diff --git a/src/glut/glx/glut_modifier.c b/src/glut/glx/glut_modifier.c
index d2919fa89b9..69fa5aba952 100644
--- a/src/glut/glx/glut_modifier.c
+++ b/src/glut/glx/glut_modifier.c
@@ -8,7 +8,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-int APIENTRY
+int GLUTAPIENTRY
 glutGetModifiers(void)
 {
   int modifiers;
diff --git a/src/glut/glx/glut_overlay.c b/src/glut/glx/glut_overlay.c
index 33ab53982e3..937ecb68240 100644
--- a/src/glut/glx/glut_overlay.c
+++ b/src/glut/glx/glut_overlay.c
@@ -356,7 +356,7 @@ determineOverlayVisual(int *treatAsSingle, Bool * visAlloced, void **fbc)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutEstablishOverlay(void)
 {
   GLUToverlay *overlay;
@@ -458,7 +458,7 @@ glutEstablishOverlay(void)
   }
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutRemoveOverlay(void)
 {
   GLUTwindow *window = __glutCurrentWindow;
@@ -481,7 +481,7 @@ glutRemoveOverlay(void)
 #endif
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutUseLayer(GLenum layer)
 {
   GLUTwindow *window = __glutCurrentWindow;
@@ -511,7 +511,7 @@ glutUseLayer(GLenum layer)
   __glutSetWindow(window);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutPostOverlayRedisplay(void)
 {
   __glutPostRedisplay(__glutCurrentWindow, GLUT_OVERLAY_REDISPLAY_WORK);
@@ -521,13 +521,13 @@ glutPostOverlayRedisplay(void)
    glutSetWindow call (entailing an expensive OpenGL context
    switch), particularly useful when multiple windows need
    redisplays posted at the same times. */
-void APIENTRY
+void GLUTAPIENTRY
 glutPostWindowOverlayRedisplay(int win)
 {
   __glutPostRedisplay(__glutWindowList[win - 1], GLUT_OVERLAY_REDISPLAY_WORK);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutOverlayDisplayFunc(GLUTdisplayCB displayFunc)
 {
   if (!__glutCurrentWindow->overlay) {
@@ -537,7 +537,7 @@ glutOverlayDisplayFunc(GLUTdisplayCB displayFunc)
   __glutCurrentWindow->overlay->display = displayFunc;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutHideOverlay(void)
 {
   if (!__glutCurrentWindow->overlay) {
@@ -548,7 +548,7 @@ glutHideOverlay(void)
   __glutCurrentWindow->overlay->shownState = 0;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutShowOverlay(void)
 {
   if (!__glutCurrentWindow->overlay) {
@@ -559,7 +559,7 @@ glutShowOverlay(void)
   __glutCurrentWindow->overlay->shownState = 1;
 }
 
-int APIENTRY
+int GLUTAPIENTRY
 glutLayerGet(GLenum param)
 {
   switch (param) {
diff --git a/src/glut/glx/glut_shapes.c b/src/glut/glx/glut_shapes.c
index ce5bebb2be2..20e21026c26 100644
--- a/src/glut/glx/glut_shapes.c
+++ b/src/glut/glx/glut_shapes.c
@@ -65,7 +65,7 @@ initQuadObj(void)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutWireSphere(GLdouble radius, GLint slices, GLint stacks)
 {
   QUAD_OBJ_INIT();
@@ -77,7 +77,7 @@ glutWireSphere(GLdouble radius, GLint slices, GLint stacks)
   gluSphere(quadObj, radius, slices, stacks);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSolidSphere(GLdouble radius, GLint slices, GLint stacks)
 {
   QUAD_OBJ_INIT();
@@ -89,7 +89,7 @@ glutSolidSphere(GLdouble radius, GLint slices, GLint stacks)
   gluSphere(quadObj, radius, slices, stacks);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutWireCone(GLdouble base, GLdouble height,
   GLint slices, GLint stacks)
 {
@@ -102,7 +102,7 @@ glutWireCone(GLdouble base, GLdouble height,
   gluCylinder(quadObj, base, 0.0, height, slices, stacks);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSolidCone(GLdouble base, GLdouble height,
   GLint slices, GLint stacks)
 {
@@ -160,13 +160,13 @@ drawBox(GLfloat size, GLenum type)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutWireCube(GLdouble size)
 {
   drawBox(size, GL_LINE_LOOP);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSolidCube(GLdouble size)
 {
   drawBox(size, GL_QUADS);
@@ -216,7 +216,7 @@ doughnut(GLfloat r, GLfloat R, GLint nsides, GLint rings)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutWireTorus(GLdouble innerRadius, GLdouble outerRadius,
   GLint nsides, GLint rings)
 {
@@ -226,7 +226,7 @@ glutWireTorus(GLdouble innerRadius, GLdouble outerRadius,
   glPopAttrib();
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius,
   GLint nsides, GLint rings)
 {
@@ -349,13 +349,13 @@ dodecahedron(GLenum type)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutWireDodecahedron(void)
 {
   dodecahedron(GL_LINE_LOOP);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSolidDodecahedron(void)
 {
   dodecahedron(GL_TRIANGLE_FAN);
@@ -466,13 +466,13 @@ octahedron(GLenum shadeType)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutWireOctahedron(void)
 {
   octahedron(GL_LINE_LOOP);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSolidOctahedron(void)
 {
   octahedron(GL_TRIANGLES);
@@ -537,13 +537,13 @@ icosahedron(GLenum shadeType)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutWireIcosahedron(void)
 {
   icosahedron(GL_LINE_LOOP);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSolidIcosahedron(void)
 {
   icosahedron(GL_TRIANGLES);
@@ -581,13 +581,13 @@ tetrahedron(GLenum shadeType)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutWireTetrahedron(void)
 {
   tetrahedron(GL_LINE_LOOP);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSolidTetrahedron(void)
 {
   tetrahedron(GL_TRIANGLES);
diff --git a/src/glut/glx/glut_space.c b/src/glut/glx/glut_space.c
index aeb00b767ed..cde6ea732ce 100644
--- a/src/glut/glx/glut_space.c
+++ b/src/glut/glx/glut_space.c
@@ -7,7 +7,7 @@
 
 #include "glutint.h"
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSpaceballMotionFunc(GLUTspaceMotionCB spaceMotionFunc)
 {
   __glutCurrentWindow->spaceMotion = spaceMotionFunc;
@@ -16,7 +16,7 @@ glutSpaceballMotionFunc(GLUTspaceMotionCB spaceMotionFunc)
     GLUT_DEVICE_MASK_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSpaceballRotateFunc(GLUTspaceRotateCB spaceRotateFunc)
 {
   __glutCurrentWindow->spaceRotate = spaceRotateFunc;
@@ -25,7 +25,7 @@ glutSpaceballRotateFunc(GLUTspaceRotateCB spaceRotateFunc)
     GLUT_DEVICE_MASK_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSpaceballButtonFunc(GLUTspaceButtonCB spaceButtonFunc)
 {
   __glutCurrentWindow->spaceButton = spaceButtonFunc;
diff --git a/src/glut/glx/glut_stroke.c b/src/glut/glx/glut_stroke.c
index 2fe408be1ad..a7af66201fe 100644
--- a/src/glut/glx/glut_stroke.c
+++ b/src/glut/glx/glut_stroke.c
@@ -8,7 +8,7 @@
 #include "glutint.h"
 #include "glutstroke.h"
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutStrokeCharacter(GLUTstrokeFont font, int c)
 {
   const StrokeCharRec *ch;
diff --git a/src/glut/glx/glut_swap.c b/src/glut/glx/glut_swap.c
index cb3f653c72c..4831b8eb351 100644
--- a/src/glut/glx/glut_swap.c
+++ b/src/glut/glx/glut_swap.c
@@ -13,7 +13,7 @@ GLint __glutSwapCount = 0;
 GLint __glutSwapTime = 0;
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutSwapBuffers(void)
 {
   GLUTwindow *window = __glutCurrentWindow;
diff --git a/src/glut/glx/glut_swidth.c b/src/glut/glx/glut_swidth.c
index e1b73745751..d999b4d38c4 100644
--- a/src/glut/glx/glut_swidth.c
+++ b/src/glut/glx/glut_swidth.c
@@ -9,7 +9,7 @@
 #include "glutstroke.h"
 
 /* CENTRY */
-int APIENTRY 
+int GLUTAPIENTRY 
 glutStrokeWidth(GLUTstrokeFont font, int c)
 {
   StrokeFontPtr fontinfo;
@@ -30,7 +30,7 @@ glutStrokeWidth(GLUTstrokeFont font, int c)
     return 0;
 }
 
-int APIENTRY 
+int GLUTAPIENTRY 
 glutStrokeLength(GLUTstrokeFont font, const unsigned char *string)
 {
   int c, length;
diff --git a/src/glut/glx/glut_tablet.c b/src/glut/glx/glut_tablet.c
index 92567f9a8e3..80c68288c1d 100644
--- a/src/glut/glx/glut_tablet.c
+++ b/src/glut/glx/glut_tablet.c
@@ -9,7 +9,7 @@
 
 #include "glutint.h"
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutTabletMotionFunc(GLUTtabletMotionCB tabletMotionFunc)
 {
   __glutCurrentWindow->tabletMotion = tabletMotionFunc;
@@ -23,7 +23,7 @@ glutTabletMotionFunc(GLUTtabletMotionCB tabletMotionFunc)
   }
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutTabletButtonFunc(GLUTtabletButtonCB tabletButtonFunc)
 {
   __glutCurrentWindow->tabletButton = tabletButtonFunc;
diff --git a/src/glut/glx/glut_teapot.c b/src/glut/glx/glut_teapot.c
index fe096e774dd..ff46d96b85a 100644
--- a/src/glut/glx/glut_teapot.c
+++ b/src/glut/glx/glut_teapot.c
@@ -195,13 +195,13 @@ teapot(GLint grid, GLdouble scale, GLenum type)
 }
 
 /* CENTRY */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSolidTeapot(GLdouble scale)
 {
   teapot(7, scale, GL_FILL);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutWireTeapot(GLdouble scale)
 {
   teapot(10, scale, GL_LINE);
diff --git a/src/glut/glx/glut_util.c b/src/glut/glx/glut_util.c
index e18a47fb83c..4ebac64c1d9 100644
--- a/src/glut/glx/glut_util.c
+++ b/src/glut/glx/glut_util.c
@@ -42,7 +42,7 @@ __glutWarning(char *format,...)
 }
 
 /* CENTRY */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutReportErrors(void)
 {
   GLenum error;
diff --git a/src/glut/glx/glut_vidresize.c b/src/glut/glx/glut_vidresize.c
index 6024d9514aa..5993e837099 100644
--- a/src/glut/glx/glut_vidresize.c
+++ b/src/glut/glx/glut_vidresize.c
@@ -50,7 +50,7 @@ catchXSGIvcErrors(Display * dpy, XErrorEvent * event)
 #endif
 
 /* CENTRY */
-int APIENTRY 
+int GLUTAPIENTRY 
 glutVideoResizeGet(GLenum param)
 {
 #if defined(GLX_VERSION_1_1) && defined(GLX_SGIX_video_resize)
@@ -160,7 +160,7 @@ glutVideoResizeGet(GLenum param)
   }
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSetupVideoResizing(void)
 {
 #if defined(GLX_VERSION_1_1) && defined(GLX_SGIX_video_resize)
@@ -173,7 +173,7 @@ glutSetupVideoResizing(void)
     __glutFatalError("glutEstablishVideoResizing: video resizing not possible.\n");
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutStopVideoResizing(void)
 {
 #if defined(GLX_VERSION_1_1) && defined(GLX_SGIX_video_resize)
@@ -188,7 +188,7 @@ glutStopVideoResizing(void)
 }
 
 /* ARGSUSED */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutVideoResize(int x, int y, int width, int height)
 {
 #if defined(GLX_VERSION_1_1) && defined(GLX_SGIX_video_resize)
@@ -207,7 +207,7 @@ glutVideoResize(int x, int y, int width, int height)
 }
 
 /* ARGSUSED */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutVideoPan(int x, int y, int width, int height)
 {
 #if defined(GLX_VERSION_1_1) && defined(GLX_SGIX_video_resize)
diff --git a/src/glut/glx/glut_warp.c b/src/glut/glx/glut_warp.c
index fa55f759145..3d48655ed1c 100644
--- a/src/glut/glx/glut_warp.c
+++ b/src/glut/glx/glut_warp.c
@@ -12,7 +12,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutWarpPointer(int x, int y)
 {
   XWarpPointer(__glutDisplay, None, __glutCurrentWindow->win,
diff --git a/src/glut/glx/glut_win.c b/src/glut/glx/glut_win.c
index 6483b97e569..4b044d084d4 100644
--- a/src/glut/glx/glut_win.c
+++ b/src/glut/glx/glut_win.c
@@ -130,7 +130,7 @@ __glutGetWindow(Window win)
 }
 
 /* CENTRY */
-int APIENTRY
+int GLUTAPIENTRY
 glutGetWindow(void)
 {
   if (__glutCurrentWindow) {
@@ -177,7 +177,7 @@ __glutSetWindow(GLUTwindow * window)
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutSetWindow(int win)
 {
   GLUTwindow *window;
@@ -695,7 +695,7 @@ __glutCreateWindow(GLUTwindow * parent,
 }
 
 /* CENTRY */
-int APIENTRY
+int GLUTAPIENTRY
 glutCreateWindow(const char *title)
 {
   static int firstWindow = 1;
@@ -742,7 +742,7 @@ glutCreateWindow(const char *title)
 }
 
 #ifdef _WIN32
-int APIENTRY
+int GLUTAPIENTRY
 __glutCreateWindowWithExit(const char *title, void (__cdecl *exitfunc)(int))
 {
   __glutExitFunc = exitfunc;
@@ -750,7 +750,7 @@ __glutCreateWindowWithExit(const char *title, void (__cdecl *exitfunc)(int))
 }
 #endif
 
-int APIENTRY
+int GLUTAPIENTRY
 glutCreateSubWindow(int win, int x, int y, int width, int height)
 {
   GLUTwindow *window;
@@ -842,7 +842,7 @@ __glutDestroyWindow(GLUTwindow * window,
 }
 
 /* CENTRY */
-void APIENTRY
+void GLUTAPIENTRY
 glutDestroyWindow(int win)
 {
   GLUTwindow *window = __glutWindowList[win - 1];
@@ -886,7 +886,7 @@ __glutChangeWindowEventMask(long eventMask, Bool add)
   }
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutDisplayFunc(GLUTdisplayCB displayFunc)
 {
   /* XXX Remove the warning after GLUT 3.0. */
@@ -895,7 +895,7 @@ glutDisplayFunc(GLUTdisplayCB displayFunc)
   __glutCurrentWindow->display = displayFunc;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutMouseFunc(GLUTmouseCB mouseFunc)
 {
   if (__glutCurrentWindow->mouse) {
@@ -917,7 +917,7 @@ glutMouseFunc(GLUTmouseCB mouseFunc)
   __glutCurrentWindow->mouse = mouseFunc;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutMotionFunc(GLUTmotionCB motionFunc)
 {
   /* Hack.  Some window managers (4Dwm by default) will mask
@@ -948,7 +948,7 @@ glutMotionFunc(GLUTmotionCB motionFunc)
   __glutCurrentWindow->motion = motionFunc;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutPassiveMotionFunc(GLUTpassiveCB passiveMotionFunc)
 {
   __glutChangeWindowEventMask(PointerMotionMask,
@@ -963,7 +963,7 @@ glutPassiveMotionFunc(GLUTpassiveCB passiveMotionFunc)
   __glutCurrentWindow->passive = passiveMotionFunc;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutEntryFunc(GLUTentryCB entryFunc)
 {
   __glutChangeWindowEventMask(EnterWindowMask | LeaveWindowMask,
@@ -974,7 +974,7 @@ glutEntryFunc(GLUTentryCB entryFunc)
   }
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutWindowStatusFunc(GLUTwindowStatusCB windowStatusFunc)
 {
   __glutChangeWindowEventMask(VisibilityChangeMask,
@@ -995,7 +995,7 @@ visibilityHelper(int status)
     __glutCurrentWindow->visibility(GLUT_VISIBLE);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutVisibilityFunc(GLUTvisibilityCB visibilityFunc)
 {
   __glutCurrentWindow->visibility = visibilityFunc;
@@ -1005,7 +1005,7 @@ glutVisibilityFunc(GLUTvisibilityCB visibilityFunc)
     glutWindowStatusFunc(NULL);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutReshapeFunc(GLUTreshapeCB reshapeFunc)
 {
   if (reshapeFunc) {
diff --git a/src/glut/glx/glut_winmisc.c b/src/glut/glx/glut_winmisc.c
index 60d5a073a89..0fc4c805f20 100644
--- a/src/glut/glx/glut_winmisc.c
+++ b/src/glut/glx/glut_winmisc.c
@@ -23,7 +23,7 @@
 #include "glutint.h"
 
 /* CENTRY */
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSetWindowTitle(const char *title)
 {
   XTextProperty textprop;
@@ -39,7 +39,7 @@ glutSetWindowTitle(const char *title)
   XFlush(__glutDisplay);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutSetIconTitle(const char *title)
 {
   XTextProperty textprop;
@@ -55,7 +55,7 @@ glutSetIconTitle(const char *title)
   XFlush(__glutDisplay);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutPositionWindow(int x, int y)
 {
   IGNORE_IN_GAME_MODE();
@@ -65,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();
@@ -78,7 +78,7 @@ glutReshapeWindow(int w, int h)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutPopWindow(void)
 {
   IGNORE_IN_GAME_MODE();
@@ -87,7 +87,7 @@ glutPopWindow(void)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutPushWindow(void)
 {
   IGNORE_IN_GAME_MODE();
@@ -96,7 +96,7 @@ glutPushWindow(void)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_CONFIGURE_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutIconifyWindow(void)
 {
   IGNORE_IN_GAME_MODE();
@@ -105,7 +105,7 @@ glutIconifyWindow(void)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_MAP_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutShowWindow(void)
 {
   IGNORE_IN_GAME_MODE();
@@ -113,7 +113,7 @@ glutShowWindow(void)
   __glutPutOnWorkList(__glutCurrentWindow, GLUT_MAP_WORK);
 }
 
-void APIENTRY 
+void GLUTAPIENTRY 
 glutHideWindow(void)
 {
   IGNORE_IN_GAME_MODE();
diff --git a/src/glut/glx/win32_menu.c b/src/glut/glx/win32_menu.c
index 20485eea65b..5ce264dcdb7 100644
--- a/src/glut/glx/win32_menu.c
+++ b/src/glut/glx/win32_menu.c
@@ -29,13 +29,13 @@ static int menuListSize = 0;
 static UINT uniqueMenuHandler = 1;
 
 /* DEPRICATED, use glutMenuStatusFunc instead. */
-void APIENTRY
+void GLUTAPIENTRY
 glutMenuStateFunc(GLUTmenuStateCB menuStateFunc)
 {
   __glutMenuStatusFunc = (GLUTmenuStatusCB) menuStateFunc;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutMenuStatusFunc(GLUTmenuStatusCB menuStatusFunc)
 {
   __glutMenuStatusFunc = menuStatusFunc;
@@ -231,7 +231,7 @@ menuModificationError(void)
   __glutFatalError("menu manipulation not allowed while menus in use.");
 }
 
-int APIENTRY
+int GLUTAPIENTRY
 glutCreateMenu(GLUTselectCB selectFunc)
 {
   GLUTmenu *menu;
@@ -259,14 +259,14 @@ glutCreateMenu(GLUTselectCB selectFunc)
   return menuid + 1;
 }
 
-int APIENTRY
+int GLUTAPIENTRY
 __glutCreateMenuWithExit(GLUTselectCB selectFunc, void (__cdecl *exitfunc)(int))
 {
   __glutExitFunc = exitfunc;
   return glutCreateMenu(selectFunc);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutDestroyMenu(int menunum)
 {
   GLUTmenu *menu = __glutGetMenuByNum(menunum);
@@ -293,7 +293,7 @@ glutDestroyMenu(int menunum)
   free(menu);
 }
 
-int APIENTRY
+int GLUTAPIENTRY
 glutGetMenu(void)
 {
   if (__glutCurrentMenu) {
@@ -303,7 +303,7 @@ glutGetMenu(void)
   }
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSetMenu(int menuid)
 {
   GLUTmenu *menu;
@@ -342,7 +342,7 @@ setMenuItem(GLUTmenuItem * item, const char *label,
   }
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutAddMenuEntry(const char *label, int value)
 {
   GLUTmenuItem *entry;
@@ -361,7 +361,7 @@ glutAddMenuEntry(const char *label, int value)
   __glutCurrentMenu->list = entry;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutAddSubMenu(const char *label, int menu)
 {
   GLUTmenuItem *submenu;
@@ -386,7 +386,7 @@ glutAddSubMenu(const char *label, int menu)
   __glutCurrentMenu->list = submenu;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutChangeToMenuEntry(int num, const char *label, int value)
 {
   GLUTmenuItem *item;
@@ -426,7 +426,7 @@ glutChangeToMenuEntry(int num, const char *label, int value)
   __glutWarning("Current menu has no %d item.", num);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutChangeToSubMenu(int num, const char *label, int menu)
 {
   GLUTmenu *popupmenu;
@@ -468,7 +468,7 @@ glutChangeToSubMenu(int num, const char *label, int menu)
   __glutWarning("Current menu has no %d item.", num);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutRemoveMenuItem(int num)
 {
   GLUTmenuItem *item, **prev;
@@ -501,7 +501,7 @@ glutRemoveMenuItem(int num)
   __glutWarning("Current menu has no %d item.", num);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutAttachMenu(int button)
 {
   if (__glutCurrentWindow == __glutGameModeWindow) {
@@ -517,7 +517,7 @@ glutAttachMenu(int button)
   __glutCurrentWindow->menu[button] = __glutCurrentMenu->id + 1;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutDetachMenu(int button)
 {
   if (__glutMappedMenu) {