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 a37b2f806f7df4904980031573476e303078d7ba..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 )
@@ -365,10 +367,7 @@ ALIAS( Map2f, Map2d )
 ALIAS( ColorTableParameteriv, ColorTableParameterfv )
 ALIAS( ConvolutionParameteriv, ConvolutionParameterfv )
 ALIAS( PointParameterivNV, PointParameterfvEXT )
-ALIAS( PointParameterfvARB, PointParameterfvEXT )
-ALIAS( PointParameteriv, PointParameterfvEXT )
 
-#  undef HAVE_ALIAS
 #  undef PURE
 #  undef FASTCALL
 #  undef INTERNAL