replaced __CYGWIN32__ with __CYGWIN__

diff --git a/include/GL/gl.h b/include/GL/gl.h
index 9ade786afd569b24387ef6ae0dc0de7a13ce2a78..63b1004bf1a697c09af32ce08afd154e2c5729d8 100644 (file)
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.40 2000/05/22 16:22:47 brianp Exp $ */
+/* $Id: gl.h,v 1.41 2000/05/22 19:40:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -48,7 +48,7 @@
 #define __WIN32__
 #endif
 
-#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__))
+#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__))
 #  if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
 #    define GLAPI __declspec(dllexport)
 #  elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
@@ -61,7 +61,7 @@
 /* non-Windows compilation */
 #  define GLAPI extern
 #  define GLAPIENTRY
-#endif /* WIN32 / CYGWIN32 bracket */
+#endif /* WIN32 / CYGWIN bracket */
 
 #if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
 #include <gl/mesa_wgl.h>

diff --git a/include/GL/glext.h b/include/GL/glext.h
index 74a4448a9e8c54711bc96376950d86e5a630524a..0eb4ca49a0b8c8a0735822497ebf685c6e9733c8 100644 (file)
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -15,7 +15,7 @@ extern "C" {
 #endif
 
 
-#if defined(_WIN32) && !defined(__CYGWIN32__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 #define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
 #endif

diff --git a/include/GL/glu.h b/include/GL/glu.h
index 249e37d16c59a25b938020c83970f35384a5540c..c03f8cb9517a1390b9d63f8041468b00f5efe8c2 100644 (file)
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@@ -1,4 +1,4 @@
-/* $Id: glu.h,v 1.20 2000/05/22 16:21:27 brianp Exp $ */
+/* $Id: glu.h,v 1.21 2000/05/22 19:40:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -39,7 +39,7 @@ extern "C" {
 
 
        /* to facilitate clean DLL building ... */
-#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__))
+#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__))
 #      if defined(_MSC_VER) && defined(BUILD_GLU32) /* tag specify we're building mesa as a DLL */
 #              define GLUAPI __declspec(dllexport)
 #      elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
@@ -53,7 +53,7 @@ extern "C" {
 #      define GLUAPI extern
 #      define GLCALLBACK
 #      define GLCALLBACKP *
-#endif /* WIN32 / CYGWIN32 bracket */
+#endif /* WIN32 / CYGWIN bracket */
 
 /* compatability guard so we don't need to change client code */
 #if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP)

diff --git a/src/glu/mesa/gluP.h b/src/glu/mesa/gluP.h
index 995dd4571fa059f532bfe8cb5a362053b2e518f6..89bfa9c92cd373bca8c6ee4b9fab6557089e53d5 100644 (file)
--- a/src/glu/mesa/gluP.h
+++ b/src/glu/mesa/gluP.h
@@ -1,4 +1,4 @@
-/* $Id: gluP.h,v 1.3 2000/05/22 16:25:37 brianp Exp $ */
+/* $Id: gluP.h,v 1.4 2000/05/22 19:41:11 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -23,6 +23,9 @@
 
 /*
  * $Log: gluP.h,v $
+ * Revision 1.4  2000/05/22 19:41:11  brianp
+ * replaced __CYGWIN32__ with __CYGWIN__
+ *
  * Revision 1.3  2000/05/22 16:25:37  brianp
  * added some Window-isms formerly in gl.h
  *
@@ -75,7 +78,7 @@
 #      define __WIN32__
 #endif
 
-#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__))
+#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__))
 #  pragma warning( disable : 4068 ) /* unknown pragma */
 #  pragma warning( disable : 4710 ) /* function 'foo' not inlined */
 #  pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
@@ -101,7 +104,7 @@
 #  define GLAPIENTRYP __stdcall *
 #  define GLCALLBACK __stdcall
 #  define GLCALLBACKP __stdcall *
-#  if defined(__CYGWIN32__)
+#  if defined(__CYGWIN__)
 #    define GLCALLBACKPCAST *
 #  else
 #    define GLCALLBACKPCAST __stdcall *
@@ -118,7 +121,7 @@
 #  define GLCALLBACKPCAST *
 #  define GLWINAPI
 #  define GLWINAPIV
-#endif /* WIN32 / CYGWIN32 bracket */
+#endif /* WIN32 / CYGWIN bracket */
 
 /* compatability guard so we don't need to change client code */