X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/6cb8cb214e85c7d67c2acca4f12551f90bf4908e..aad86e2b1854e6cf9b1f3c702c4d5801c1a9f58a:/unixish.h

diff --git a/unixish.h b/unixish.h
index a08e8ba..5f95ba5 100644
--- a/unixish.h
+++ b/unixish.h
@@ -1,7 +1,7 @@
 /*    unixish.h
  *
- *    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001,
- *    by Larry Wall and others
+ *    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
+ *    2003, 2006 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -127,15 +127,16 @@
 #define Mkdir(path,mode)   mkdir((path),(mode))
 
 #ifndef PERL_SYS_INIT
-#  define PERL_SYS_INIT(c,v) MALLOC_CHECK_TAINT2(*c,*v) PERL_FPU_INIT MALLOC_INIT
+#  define PERL_SYS_INIT(c,v)						\
+	MALLOC_CHECK_TAINT2(*c,*v) PERL_FPU_INIT; PERLIO_INIT; MALLOC_INIT
 #endif
 
 #ifndef PERL_SYS_TERM
-# ifdef USE_PERLIO
-#  define PERL_SYS_TERM()		HINTS_REFCNT_TERM; OP_REFCNT_TERM; PERLIO_TERM; MALLOC_TERM
-# else
-#  define PERL_SYS_TERM()		HINTS_REFCNT_TERM; OP_REFCNT_TERM; MALLOC_TERM
-# endif
+#  define PERL_SYS_TERM() \
+    if (!PL_veto_cleanup) { \
+	HINTS_REFCNT_TERM; OP_REFCNT_TERM; PERLIO_TERM; MALLOC_TERM; \
+    }
+
 #endif
 
 #define BIT_BUCKET "/dev/null"