diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2006-07-13 22:47:29 +0300 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2006-07-13 17:12:00 +0000 |
| commit | 2f3efc978ada94e3718bd6f3a25b06cd1d13b6f8 (patch) | |
| tree | 4fbd3f59e65577085646ea3f266175edf15efd1e /miniperlmain.c | |
| parent | 6ae709ad20fb5debe5f58c9686ed99226819442f (diff) | |
| download | perl-2f3efc978ada94e3718bd6f3a25b06cd1d13b6f8.tar.gz | |
z/OS: non-CPAN ext and lib + main() without the third arg + Stephen McCamant's comment
Message-ID: <44B67921.6090901@iki.fi>
p4raw-id: //depot/perl@28567
Diffstat (limited to 'miniperlmain.c')
| -rw-r--r-- | miniperlmain.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/miniperlmain.c b/miniperlmain.c index 601008719f..ca27aaf545 100644 --- a/miniperlmain.c +++ b/miniperlmain.c @@ -53,8 +53,14 @@ static struct perl_vars* my_plvarsp; struct perl_vars* Perl_GetVarsPrivate(void) { return my_plvarsp; } #endif +#ifdef NO_ENV_ARRAY_IN_MAIN +extern char **environ; +int +main(int argc, char **argv) +#else int main(int argc, char **argv, char **env) +#endif { dVAR; int exitstatus; @@ -73,7 +79,11 @@ main(int argc, char **argv, char **env) /* noop unless Configure is given -Accflags=-DPERL_GPROF_CONTROL */ PERL_GPROF_MONCONTROL(0); +#ifdef NO_ENV_ARRAY_IN_MAIN + PERL_SYS_INIT3(&argc,&argv,&environ); +#else PERL_SYS_INIT3(&argc,&argv,&env); +#endif #if defined(USE_ITHREADS) /* XXX Ideally, this should really be happening in perl_alloc() or @@ -106,7 +116,7 @@ main(int argc, char **argv, char **env) perl_free(my_perl); -#if defined(USE_ENVIRON_ARRAY) && defined(PERL_TRACK_MEMPOOL) +#if defined(USE_ENVIRON_ARRAY) && defined(PERL_TRACK_MEMPOOL) && !defined(NO_ENV_ARRAY_IN_MAIN) /* * The old environment may have been freed by perl_free() * when PERL_TRACK_MEMPOOL is defined, but without having |