X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=miniperlmain.c;h=d1b3e8ed99ec8f3db28222391ca5c15dcf6fbfb0;hb=fce230d754ec6ae18a0b1289155fa97e3b459bbc;hp=cfbe95b7364818bc3180987a33ab0596167f1792;hpb=61ae2fbf8676dafa05a9a9a710fde421f30a2071;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/miniperlmain.c b/miniperlmain.c
index cfbe95b..d1b3e8e 100644
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -8,9 +8,10 @@
 
 
 #include "EXTERN.h"
+#define PERL_IN_MINIPERLMAIN_C
 #include "perl.h"
 
-static void xs_init _((void));
+static void xs_init (pTHX);
 static PerlInterpreter *my_perl;
 
 #if defined (__MINT__) || defined (atarist)
@@ -26,37 +27,37 @@ main(int argc, char **argv, char **env)
 
 #ifdef PERL_GLOBAL_STRUCT
 #define PERLVAR(var,type) /**/
+#define PERLVARA(var,type) /**/
 #define PERLVARI(var,type,init) PL_Vars.var = init;
 #define PERLVARIC(var,type,init) PL_Vars.var = init;
 #include "perlvars.h"
 #undef PERLVAR
+#undef PERLVARA
 #undef PERLVARI
 #undef PERLVARIC
 #endif
 
-    PERL_SYS_INIT(&argc,&argv);
-
-    perl_init_i18nl10n(1);
+    PERL_SYS_INIT3(&argc,&argv,&env);
 
     if (!PL_do_undump) {
 	my_perl = perl_alloc();
 	if (!my_perl)
 	    exit(1);
-	perl_construct( my_perl );
+	perl_construct(my_perl);
 	PL_perl_destruct_level = 0;
     }
 
-    exitstatus = perl_parse( my_perl, xs_init, argc, argv, (char **) NULL );
+    exitstatus = perl_parse(my_perl, xs_init, argc, argv, (char **)NULL);
     if (!exitstatus) {
-	exitstatus = perl_run( my_perl );
+	exitstatus = perl_run(my_perl);
     }
 
-    perl_destruct( my_perl );
-    perl_free( my_perl );
+    perl_destruct(my_perl);
+    perl_free(my_perl);
 
     PERL_SYS_TERM();
 
-    exit( exitstatus );
+    exit(exitstatus);
     return exitstatus;
 }
 
@@ -65,7 +66,7 @@ main(int argc, char **argv, char **env)
 /* Do not delete this line--writemain depends on it */
 
 static void
-xs_init(void)
+xs_init(pTHX)
 {
-  dXSUB_SYS;
+    dXSUB_SYS;
 }