bring in changes from 6.4 branch

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

diff --git a/src/glx/x11/indirect_size.h b/src/glx/x11/indirect_size.h
index 6083ac5165873233d2dafcc12bac41828f8f1fad..9ba0bd690755a3facf4cd7ae0635de2199073d18 100644 (file)
--- a/src/glx/x11/indirect_size.h
+++ b/src/glx/x11/indirect_size.h
@@ -1,4 +1,4 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_send.py (from Mesa) script */
+/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
 
 /*
  * (C) Copyright IBM Corporation 2004
@@ -25,6 +25,8 @@
  * SOFTWARE.
  */
 
+#if !defined( _INDIRECT_SIZE_H_ )
+#  define _INDIRECT_SIZE_H_
 
 /**
  * \file
@@ -34,23 +36,19 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#if !defined( _GLXSIZE_H_ )
-#  define _GLXSIZE_H_
-
-
 #  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
 #    define PURE __attribute__((pure))
 #  else
 #    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
@@ -83,7 +81,8 @@ extern INTERNAL PURE FASTCALL GLint __glConvolutionParameteriv_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glPointParameterfvEXT_size(GLenum);
 extern INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum);
 
-#  undef INTERNAL
 #  undef PURE
 #  undef FASTCALL
-#endif /* !defined( _GLXSIZE_H_ ) */
+#  undef INTERNAL
+
+#endif /* !defined( _INDIRECT_SIZE_H_ ) */