Fix Windows build problems.

[mesa.git] / src / glx / x11 / indirect_size.c

diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c
index c21e1ee086f8447a6c84916865b487c88c49a538..bd89cec00f19142f1a2ca6c2fd62663f9aaa25e6 100644 (file)
--- a/src/glx/x11/indirect_size.c
+++ b/src/glx/x11/indirect_size.c
@@ -29,10 +29,6 @@
 #include <GL/gl.h>
 #include "indirect_size.h"
 
-#  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#    define HAVE_ALIAS
-#  endif
-
 #  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
 #    define PURE __attribute__((pure))
 #  else
@@ -51,7 +47,6 @@
 #    define INTERNAL
 #  endif
 
-
 #ifdef HAVE_ALIAS
 #  define ALIAS2(from,to) \
     INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
@@ -63,6 +58,13 @@
     { return __gl ## to ## _size( e ); }
 #endif
 
+#  if defined(__CYGWIN__) || defined(WIN32)
+#    undef FASTCALL
+#    define FASTCALL
+#    undef HAVE_ALIAS
+#    undef INTERNAL
+#    define INTERNAL
+#  endif
 
 INTERNAL PURE FASTCALL GLint
 __glCallLists_size( GLenum e )
@@ -132,6 +134,7 @@ __glLightModelfv_size( GLenum e )
         case GL_LIGHT_MODEL_LOCAL_VIEWER:
         case GL_LIGHT_MODEL_TWO_SIDE:
         case GL_LIGHT_MODEL_COLOR_CONTROL:
+/*      case GL_LIGHT_MODEL_COLOR_CONTROL_EXT:*/
             return 1;
         case GL_LIGHT_MODEL_AMBIENT:
             return 4;
@@ -333,22 +336,18 @@ __glPointParameterfvEXT_size( GLenum e )
     switch( e ) {
         case GL_POINT_SIZE_MIN:
 /*      case GL_POINT_SIZE_MIN_ARB:*/
-/*      case GL_POINT_SIZE_MIN_EXT:*/
 /*      case GL_POINT_SIZE_MIN_SGIS:*/
         case GL_POINT_SIZE_MAX:
 /*      case GL_POINT_SIZE_MAX_ARB:*/
-/*      case GL_POINT_SIZE_MAX_EXT:*/
 /*      case GL_POINT_SIZE_MAX_SGIS:*/
         case GL_POINT_FADE_THRESHOLD_SIZE:
 /*      case GL_POINT_FADE_THRESHOLD_SIZE_ARB:*/
-/*      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:*/
 /*      case GL_POINT_FADE_THRESHOLD_SIZE_SGIS:*/
         case GL_POINT_SPRITE_R_MODE_NV:
         case GL_POINT_SPRITE_COORD_ORIGIN:
             return 1;
         case GL_POINT_DISTANCE_ATTENUATION:
 /*      case GL_POINT_DISTANCE_ATTENUATION_ARB:*/
-/*      case GL_POINT_DISTANCE_ATTENUATION_EXT:*/
 /*      case GL_POINT_DISTANCE_ATTENUATION_SGIS:*/
             return 3;
         default: return 0;
@@ -368,3 +367,7 @@ ALIAS( Map2f, Map2d )
 ALIAS( ColorTableParameteriv, ColorTableParameterfv )
 ALIAS( ConvolutionParameteriv, ConvolutionParameterfv )
 ALIAS( PointParameterivNV, PointParameterfvEXT )
+
+#  undef PURE
+#  undef FASTCALL
+#  undef INTERNAL