bring in changes from 6.4 branch

[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 e87229a7d0a5366ebe3c9d5dd3e691579f43b403..79d57d55b68f82d619b524881a7629ec46a130c4 100644 (file)
--- a/src/glx/x11/indirect_size.c
+++ b/src/glx/x11/indirect_size.c
@@ -35,18 +35,22 @@
 #    define PURE
 #  endif
 
-#  if defined(__i386__) && defined(__GNUC__)
+#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
 #    define FASTCALL __attribute__((fastcall))
 #  else
 #    define FASTCALL
 #  endif
 
-#  if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
+#  if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
 #    define INTERNAL  __attribute__((visibility("internal")))
 #  else
 #    define INTERNAL
 #  endif
 
+
+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)
+#  undef HAVE_ALIAS
+#endif
 #ifdef HAVE_ALIAS
 #  define ALIAS2(from,to) \
     INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
@@ -58,13 +62,6 @@
     { return __gl ## to ## _size( e ); }
 #endif
 
-#  if defined(__CYGWIN__) || defined(__MINGW32__)
-#    undef FASTCALL
-#    define FASTCALL
-#    undef HAVE_ALIAS
-#    undef INTERNAL
-#    define INTERNAL
-#  endif
 
 INTERNAL PURE FASTCALL GLint
 __glCallLists_size( GLenum e )