3 files changed, 3 insertions, 3 deletions
diff --git a/src/glx/indirect.h b/src/glx/indirect.h
index 22bdb827d96..5c9bd6f9ea2 100644
--- a/src/glx/indirect.h
+++ b/src/glx/indirect.h
@@ -37,7 +37,7 @@
  * \author Ian Romanick <[email protected]>
  */
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
+#  if (defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) && defined(__ELF__))
 #    define HIDDEN  __attribute__((visibility("hidden")))
 #  else
 #    define HIDDEN
diff --git a/src/glx/indirect_size.c b/src/glx/indirect_size.c
index 137e69cb044..90f887d5cbd 100644
--- a/src/glx/indirect_size.c
+++ b/src/glx/indirect_size.c
@@ -41,7 +41,7 @@
 #define FASTCALL
 #endif
 
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
+#if (defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) && defined(__ELF__))
 #define INTERNAL  __attribute__((visibility("internal")))
 #else
 #define INTERNAL
diff --git a/src/glx/indirect_size.h b/src/glx/indirect_size.h
index 9857b6c75e6..768765fb202 100644
--- a/src/glx/indirect_size.h
+++ b/src/glx/indirect_size.h
@@ -48,7 +48,7 @@
 #define FASTCALL
 #endif
 
-#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
+#if (defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590) && defined(__ELF__))
 #define INTERNAL  __attribute__((visibility("internal")))
 #else
 #define INTERNAL