X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=miniperlmain.c;h=5b075a52dd7d05ed148e43921ab23670a72c8f3f;hb=75e14d17912ce8a35d5c2b04c0c6e30b903ab97f;hp=a55a8556f459fa1080c589fb120d36f592b5bc3f;hpb=8ac853655d9b744749adcb9687c13d99cdd6e9fb;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/miniperlmain.c b/miniperlmain.c
index a55a855..5b075a5 100644
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -6,35 +6,28 @@
 #pragma runopts(HEAP(1M,32K,ANYWHERE,KEEP,8K,4K))
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include "EXTERN.h"
 #include "perl.h"
 
-#ifdef __cplusplus
-}
-#  define EXTERN_C extern "C"
-#else
-#  define EXTERN_C extern
-#endif
-
 static void xs_init _((void));
 static PerlInterpreter *my_perl;
 
 int
-#ifdef CAN_PROTOTYPE
 main(int argc, char **argv, char **env)
-#else
-main(argc, argv, env)
-int argc;
-char **argv;
-char **env;
-#endif
 {
     int exitstatus;
 
+#ifdef PERL_GLOBAL_STRUCT
+#define PERLVAR(var,type) /**/
+#define PERLVARI(var,type,init) Perl_Vars.var = init;
+#define PERLVARIC(var,type,init) Perl_Vars.var = init;
+#include "perlvars.h"
+#undef PERLVAR
+#undef PERLVARI
+#undef PERLVARIC
+#endif
+
     PERL_SYS_INIT(&argc,&argv);
 
     perl_init_i18nl10n(1);
@@ -58,6 +51,7 @@ char **env;
     PERL_SYS_TERM();
 
     exit( exitstatus );
+    return exitstatus;
 }
 
 /* Register any extra external extensions */