Always defining PERLIO_TERM, even if it's empty, makes for a simpler

PERL_SYS_TERM

p4raw-id: //depot/perl@29073

diff --git a/dosish.h b/dosish.h
index a5eeace..b930de2 100644 (file)
--- a/dosish.h
+++ b/dosish.h
@@ -43,11 +43,7 @@
 #endif /* DJGPP */
 
 #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
 #endif
 #define dXSUB_SYS
 

diff --git a/perl.h b/perl.h
index 93dad5b..d047030 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -3876,6 +3876,9 @@ EXTERN_C void PerlIO_teardown(pTHX);
 #  define PERLIO_INIT
 #  define PERLIO_TERM  PerlIO_teardown(aTHX)
 # endif
+#else
+#  define PERLIO_INIT
+#  define PERLIO_TERM
 #endif
 
 #ifdef MYMALLOC

diff --git a/unixish.h b/unixish.h
index a08e8ba..eeb074e 100644 (file)
--- a/unixish.h
+++ b/unixish.h
@@ -131,11 +131,7 @@
 #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
 #endif
 
 #define BIT_BUCKET "/dev/null"