2 files changed, 14 insertions, 1 deletions
diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c
index b8886e4859..bd89cec00f 100644
--- a/src/glx/x11/indirect_size.c
+++ b/src/glx/x11/indirect_size.c
@@ -47,7 +47,6 @@
 #    define INTERNAL
 #  endif
 
-
 #ifdef HAVE_ALIAS
 #  define ALIAS2(from,to) \
     INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
@@ -59,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 )
diff --git a/src/glx/x11/indirect_size.h b/src/glx/x11/indirect_size.h
index ba7fc35b24..090d0a2e92 100644
--- a/src/glx/x11/indirect_size.h
+++ b/src/glx/x11/indirect_size.h
@@ -54,6 +54,13 @@
 #    define INTERNAL
 #  endif
 
+#  if defined(__CYGWIN__) || defined(WIN32)
+#    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);