X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=miniperlmain.c;h=e2415d8a53435ba11cbbbea63f3589ede7a19e0f;hb=5dc83c4054cb6624685a80f58caabe5e173a543f;hp=2c924ebe2e45d729bd82fd49ba06f789ec062d24;hpb=52e18b1f277416a33dff2c066a83fdab0520a2d7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/miniperlmain.c b/miniperlmain.c
index 2c924eb..e2415d8 100644
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -1,3 +1,12 @@
+/*    miniperlmain.c
+ *
+ *    Copyright (c) 1997-2002, Larry Wall
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ *
+ */
+
 /*
  * "The Road goes ever on and on, down from the door where it began."
  */
@@ -48,7 +57,7 @@ main(int argc, char **argv, char **env)
 
     PERL_SYS_INIT3(&argc,&argv,&env);
 
-#if defined(USE_THREADS) || defined(USE_ITHREADS)
+#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
     /* XXX Ideally, this should really be happening in perl_alloc() or
      * perl_construct() to keep libperl.a transparently fork()-safe.
      * It is currently done here only because Apache/mod_perl have
@@ -70,13 +79,13 @@ main(int argc, char **argv, char **env)
 	perl_construct(my_perl);
 	PL_perl_destruct_level = 0;
     }
-
+    PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
     exitstatus = perl_parse(my_perl, xs_init, argc, argv, (char **)NULL);
-    if (!exitstatus) {
-	exitstatus = perl_run(my_perl);
-    }
+    if (!exitstatus)
+        perl_run(my_perl);
+      
+    exitstatus = perl_destruct(my_perl);
 
-    perl_destruct(my_perl);
     perl_free(my_perl);
 
     PERL_SYS_TERM();