X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Frunperl.c;h=b76f8ba2d2be4fec4983441d22a7b72f2a25c4f7;hb=3ce3ed558a83da8e2c458cdff55957484ff161a7;hp=8e6b249b4445cdee85a56ca155a252842d881db8;hpb=c5be433b5c5658093bc9cae4434721a0b63e7a85;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/runperl.c b/win32/runperl.c
index 8e6b249..b76f8ba 100644
--- a/win32/runperl.c
+++ b/win32/runperl.c
@@ -2,17 +2,18 @@
 #include "perl.h"
 
 #ifdef __GNUC__
-/*
- * GNU C does not do __declspec()
- */
-#define __declspec(foo) 
 
 /* Mingw32 defaults to globing command line 
  * This is inconsistent with other Win32 ports and 
  * seems to cause trouble with passing -DXSVERSION=\"1.6\" 
- * So we turn it off like this:
+ * So we turn it off like this, but only when compiling
+ * perlmain.c: perlmainst.c is linked into the same executable
+ * as win32.c, which also does this, so we mustn't do it twice
+ * otherwise we get a multiple definition error.
  */
+#ifndef PERLDLL
 int _CRT_glob = 0;
+#endif
 
 #endif