Fix C99ism in dump.c

[perl5.git] / miniperlmain.c

diff --git a/miniperlmain.c b/miniperlmain.c
index 48993cd..6010087 100644 (file)
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -101,11 +101,24 @@ main(int argc, char **argv, char **env)
     exitstatus = perl_parse(my_perl, xs_init, argc, argv, (char **)NULL);
     if (!exitstatus)
         perl_run(my_perl);
-      
+
     exitstatus = perl_destruct(my_perl);
 
     perl_free(my_perl);
 
+#if defined(USE_ENVIRON_ARRAY) && defined(PERL_TRACK_MEMPOOL)
+    /*
+     * The old environment may have been freed by perl_free()
+     * when PERL_TRACK_MEMPOOL is defined, but without having
+     * been restored by perl_destruct() before (this is only
+     * done if destruct_level > 0).
+     *
+     * It is important to have a valid environment for atexit()
+     * routines that are eventually called.
+     */
+    environ = env;
+#endif
+
 #ifdef PERL_GLOBAL_STRUCT
     free_global_struct(plvarsp);
 #endif /* PERL_GLOBAL_STRUCT */
@@ -123,6 +136,7 @@ main(int argc, char **argv, char **env)
 static void
 xs_init(pTHX)
 {
+    PERL_UNUSED_CONTEXT;
     dXSUB_SYS;
 }
 
@@ -133,5 +147,5 @@ xs_init(pTHX)
  * indent-tabs-mode: t
  * End:
  *
- * vim: ts=8 sts=4 sw=4 noet:
-*/
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */