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

diff --git a/win32/runperl.c b/win32/runperl.c
index ff0a571..b76f8ba 100644
--- a/win32/runperl.c
+++ b/win32/runperl.c
@@ -1,12 +1,26 @@
-/* Say NO to CPP! Hallelujah! */
+#include "EXTERN.h"
+#include "perl.h"
+
 #ifdef __GNUC__
-#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, 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
 
-__declspec(dllimport) int RunPerl(int argc, char **argv, char **env, void *ios);
+#endif
 
 int
 main(int argc, char **argv, char **env)
 {
-    return RunPerl(argc, argv, env, (void*)0);
+    return RunPerl(argc, argv, env);
 }
+
+