X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=miniperlmain.c;h=d1b3e8ed99ec8f3db28222391ca5c15dcf6fbfb0;hb=b8bfa007e85f190696666dcd944c1c01b7860b92;hp=1ac5de4723d52e78a5e5cd823ee046e4cf2fcaa2;hpb=cea2e8a9dd23747fd2b66edc86c58c64e9970321;p=p5sagit%2Fp5-mst-13.2.git diff --git a/miniperlmain.c b/miniperlmain.c index 1ac5de4..d1b3e8e 100644 --- a/miniperlmain.c +++ b/miniperlmain.c @@ -13,7 +13,6 @@ static void xs_init (pTHX); static PerlInterpreter *my_perl; -static struct perl_thread *thr; /* XXXXXX testing */ #if defined (__MINT__) || defined (atarist) /* The Atari operating system doesn't have a dynamic stack. The @@ -28,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); - - 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; } @@ -69,5 +68,5 @@ main(int argc, char **argv, char **env) static void xs_init(pTHX) { - dXSUB_SYS; + dXSUB_SYS; }