summaryrefslogtreecommitdiffstats
path: root/src/glx
diff options
context:
space:
mode:
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/x11/indirect_size.c15
-rw-r--r--src/glx/x11/indirect_size.h11
2 files changed, 8 insertions, 18 deletions
diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c
index e87229a7d0a..438d545b6bf 100644
--- 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(__CYGWIN__) && !defined(__MINGW32__)
# define INTERNAL __attribute__((visibility("internal")))
# else
# define INTERNAL
# endif
+
+#if defined(__CYGWIN__) || defined(__MINGW32__)
+# 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 )
diff --git a/src/glx/x11/indirect_size.h b/src/glx/x11/indirect_size.h
index 181bdfdfd0d..46122a2519c 100644
--- a/src/glx/x11/indirect_size.h
+++ b/src/glx/x11/indirect_size.h
@@ -42,25 +42,18 @@
# 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(__CYGWIN__) && !defined(__MINGW32__)
# define INTERNAL __attribute__((visibility("internal")))
# else
# define INTERNAL
# endif
-# if defined(__CYGWIN__) || defined(__MINGW32__)
-# undef FASTCALL
-# define FASTCALL
-# undef INTERNAL
-# define INTERNAL
-# endif
-
extern INTERNAL PURE FASTCALL GLint __glCallLists_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glFogfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glFogiv_size(GLenum);