From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 16 Feb 2005 19:52:35 +0000 (+0000)
Subject: fix non-Win32 definition of GLUTAPIENTRY, remove some cruft
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f321f16e83cae427d6496c11955fd1c898d0395c;p=mesa.git

fix non-Win32 definition of GLUTAPIENTRY, remove some cruft
---

diff --git a/include/GL/glut.h b/include/GL/glut.h
index 2e5be8a77c2..23c740ee117 100644
--- a/include/GL/glut.h
+++ b/include/GL/glut.h
@@ -193,13 +193,11 @@ WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
 #else /* _WIN32 not defined */
 
 /* Define GLUTAPIENTRY and GLUTCALLBACK to nothing if we aren't on Win32. */
-#  define GLUTAPIENTRY GLAPI
+#  define GLUTAPIENTRY GLAPIENTRY
 #  define GLUTAPIENTRYV
-#  define GLUT_APIENTRY_DEFINED
 #  define GLUTCALLBACK
 #  define GLUTAPI extern
-/* Prototype exit for the non-Win32 case (see above). */
-/*extern void exit(int);  this screws up gcc -ansi -pedantic! */
+
 #endif
 
 
@@ -747,26 +745,4 @@ GLUTAPI int GLUTAPIENTRY glutGameModeGet(GLenum mode);
 }
 #endif
 
-#if 0
-#ifdef GLUT_APIENTRY_DEFINED
-# undef GLUT_APIENTRY_DEFINED
-# undef APIENTRY
-#endif
-
-#ifdef GLUT_WINGDIAPI_DEFINED
-# undef GLUT_WINGDIAPI_DEFINED
-# undef WINGDIAPI
-#endif
-
-#ifdef GLUT_DEFINED___CDECL
-# undef GLUT_DEFINED___CDECL
-# undef __cdecl
-#endif
-
-#ifdef GLUT_DEFINED__CRTIMP
-# undef GLUT_DEFINED__CRTIMP
-# undef _CRTIMP
-#endif
-#endif
-
 #endif                  /* __glut_h__ */