X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=miniperlmain.c;h=5b075a52dd7d05ed148e43921ab23670a72c8f3f;hb=00dc2f4f23da07658d2634f904ac3a098aaa4153;hp=bc81e997372569fcb99ce5ae2aa48a5a015a8890;hpb=a91be337f157c8dc7b6d4732321bf32b45a1f51c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/miniperlmain.c b/miniperlmain.c
index bc81e99..5b075a5 100644
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -2,51 +2,48 @@
  * "The Road goes ever on and on, down from the door where it began."
  */
 
-#ifdef __cplusplus
-extern "C" {
+#ifdef OEMVS
+#pragma runopts(HEAP(1M,32K,ANYWHERE,KEEP,8K,4K))
 #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_i18nl14n(1);
+    perl_init_i18nl10n(1);
 
     if (!do_undump) {
 	my_perl = perl_alloc();
 	if (!my_perl)
 	    exit(1);
 	perl_construct( my_perl );
+	perl_destruct_level = 0;
     }
 
     exitstatus = perl_parse( my_perl, xs_init, argc, argv, (char **) NULL );
-    if (exitstatus)
-	exit( exitstatus );
-
-    exitstatus = perl_run( my_perl );
+    if (!exitstatus) {
+	exitstatus = perl_run( my_perl );
+    }
 
     perl_destruct( my_perl );
     perl_free( my_perl );
@@ -54,6 +51,7 @@ char **env;
     PERL_SYS_TERM();
 
     exit( exitstatus );
+    return exitstatus;
 }
 
 /* Register any extra external extensions */
@@ -61,7 +59,7 @@ char **env;
 /* Do not delete this line--writemain depends on it */
 
 static void
-xs_init()
+xs_init(void)
 {
   dXSUB_SYS;
 }