From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 21 Oct 2006 21:31:20 +0000 (+0000)
Subject: Add PERLIO_INIT to PERL_SYS_INIT.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2f44961c9ce6c8fb4890c3bab297136d08c70307;p=p5sagit%2Fp5-mst-13.2.git

Add PERLIO_INIT to PERL_SYS_INIT.
I infer that this was accidentally omitted from change 29060

p4raw-id: //depot/perl@29074
---

diff --git a/dosish.h b/dosish.h
index b930de2..35ed99d 100644
--- a/dosish.h
+++ b/dosish.h
@@ -16,7 +16,8 @@
 #ifdef DJGPP
 #  define BIT_BUCKET "nul"
 #  define OP_BINARY O_BINARY
-#  define PERL_SYS_INIT(c,v) MALLOC_CHECK_TAINT2(*c,*v) Perl_DJGPP_init(c,v)
+#  define PERL_SYS_INIT(c,v)						\
+	 MALLOC_CHECK_TAINT2(*c,*v) Perl_DJGPP_init(c,v); PERLIO_INIT
 #  define init_os_extras Perl_init_os_extras
 #  define HAS_UTIME
 #  define HAS_KILL
@@ -28,15 +29,18 @@
 #  define PERL_FS_VER_FMT	"%d_%d_%d"
 #else	/* DJGPP */
 #  ifdef WIN32
-#    define PERL_SYS_INIT(c,v)	MALLOC_CHECK_TAINT2(*c,*v) Perl_win32_init(c,v)
+#    define PERL_SYS_INIT(c,v)						\
+	MALLOC_CHECK_TAINT2(*c,*v) Perl_win32_init(c,v); PERLIO_INIT
 #    define PERL_SYS_TERM()	Perl_win32_term()
 #    define BIT_BUCKET "nul"
 #  else
 #	 ifdef NETWARE
-#      define PERL_SYS_INIT(c,v)	MALLOC_CHECK_TAINT2(*c,*v) Perl_nw5_init(c,v)
+#      define PERL_SYS_INIT(c,v)					\
+	MALLOC_CHECK_TAINT2(*c,*v) Perl_nw5_init(c,v); PERLIO_INIT
 #      define BIT_BUCKET "nwnul"
 #    else
-#      define PERL_SYS_INIT(c,v)	MALLOC_CHECK_TAINT2(*c,*v)
+#      define PERL_SYS_INIT(c,v)		\
+	MALLOC_CHECK_TAINT2(*c,*v); PERLIO_INIT
 #      define BIT_BUCKET "\\dev\\nul" /* "wanna be like, umm, Newlined, or somethin?" */
 #    endif /* NETWARE */
 #  endif
diff --git a/perl.h b/perl.h
index d047030..b23439f 100644
--- a/perl.h
+++ b/perl.h
@@ -3865,7 +3865,7 @@ typedef Sighandler_t Sigsave_t;
 
 #ifdef USE_PERLIO
 EXTERN_C void PerlIO_teardown(pTHX);
-# ifdef USE_THREADS
+# ifdef USE_ITHREADS
 #  define PERLIO_INIT MUTEX_INIT(&PL_perlio_mutex)
 #  define PERLIO_TERM 				\
 	STMT_START {				\
diff --git a/unixish.h b/unixish.h
index eeb074e..8a1a943 100644
--- a/unixish.h
+++ b/unixish.h
@@ -127,7 +127,8 @@
 #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