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

diff --git a/win32/runperl.c b/win32/runperl.c
index 07e2bd6..b76f8ba 100644
--- a/win32/runperl.c
+++ b/win32/runperl.c
@@ -1,18 +1,26 @@
-#include <stdio.h>
-#include <win32io.h>
+#include "EXTERN.h"
+#include "perl.h"
 
-#ifndef _DLL
-extern WIN32_IOSUBSYSTEM win32stdio;
+#ifdef __GNUC__
+
+/* 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
 
-extern int RunPerl(int argc, char **argv, char **env, void *iosubsystem);
+#endif
 
 int
 main(int argc, char **argv, char **env)
 {
-#ifdef _DLL
-    return (RunPerl(argc, argv, env, NULL));
-#else
-    return (RunPerl(argc, argv, env, &win32stdio));
-#endif
+    return RunPerl(argc, argv, env);
 }
+
+