summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dosish.h12
-rw-r--r--perl.h2
-rw-r--r--unixish.h3
3 files changed, 11 insertions, 6 deletions
diff --git a/dosish.h b/dosish.h
index b930de2e3b..35ed99dbff 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 d047030a9c..b23439f681 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 eeb074e80c..8a1a9437ba 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