[win32] integrate mainline

[p5sagit/p5-mst-13.2.git] / EXTERN.h

diff --git a/EXTERN.h b/EXTERN.h
index 91c8d4a..a48d0d3 100644 (file)
--- a/EXTERN.h
+++ b/EXTERN.h
@@ -23,16 +23,16 @@
 #  define EXTCONST globalref
 #  define dEXTCONST globaldef {"$GLOBAL_RO_VARS"} readonly
 #else
-#  if defined(_MSC_VER) && defined(_WIN32)
+#  if defined(WIN32) && !defined(__GNUC__)
 #    ifdef PERLDLL
-#      define EXT __declspec(dllexport)
+#      define EXT extern __declspec(dllexport)
 #      define dEXT 
-#      define EXTCONST __declspec(dllexport) const
+#      define EXTCONST extern __declspec(dllexport) const
 #      define dEXTCONST const
 #    else
-#      define EXT __declspec(dllimport)
+#      define EXT extern __declspec(dllimport)
 #      define dEXT 
-#      define EXTCONST __declspec(dllimport) const
+#      define EXTCONST extern __declspec(dllimport) const
 #      define dEXTCONST const
 #    endif
 #  else