summaryrefslogtreecommitdiff
path: root/reentr.c
diff options
context:
space:
mode:
authorIlya Zakharevich <ilya@math.berkeley.edu>2003-03-31 04:43:37 -0800
committerJarkko Hietaniemi <jhi@iki.fi>2003-04-01 16:32:03 +0000
commit5c728af092d5febae92774d9106a235643cb49e5 (patch)
treef2b54077514f1f871504f57b7633df9dcdb72876 /reentr.c
parent15978375e3ac30958ab56d2e88249ad742eecd30 (diff)
downloadperl-5c728af092d5febae92774d9106a235643cb49e5.tar.gz
Integrate:
[ 19106] Subject: [PATCH 5.8.1 @19053] OS/2-related patches Message-ID: <20030331204337.GA3634@math.berkeley.edu> and regen Configure. p4raw-link: @19106 on //depot/maint-5.8/perl: 8257dec7ed17c0d4d721411d2a781ceadf724da5 p4raw-id: //depot/perl@19120 p4raw-edited: from //depot/maint-5.8/perl@19118 'edit in' embedvar.h (@18804..) p4raw-integrated: from //depot/maint-5.8/perl@19118 'copy in' os2/Makefile.SHs os2/OS2/ExtAttr/Changes os2/OS2/ExtAttr/ExtAttr.pm os2/OS2/PrfDB/Changes os2/OS2/PrfDB/PrfDB.pm os2/OS2/REXX/DLL/DLL.pm os2/OS2/REXX/REXX.pm os2/dl_os2.c os2/os2thread.h (@17645..) ext/threads/threads.xs (@18619..) perlio.c (@18948..) Makefile.SH (@19061..) 'ignore' embed.pl (@18872..) embed.h (@19011..) embed.fnc (@19030..) 'merge in' os2/os2ish.h (@17645..) os2/os2.c (@18347..) perlapi.h (@18804..) perlvars.h (@18808..) makedef.pl (@18896..) intrpvar.h (@18920..) sv.c (@18961..) p4raw-edited: from //depot/maint-5.8/perl@19106 'edit in' Configure (@19040..) p4raw-integrated: from //depot/maint-5.8/perl@19106 'copy in' reentr.h (@18850..) reentr.c reentr.pl (@18922..)
Diffstat (limited to 'reentr.c')
-rw-r--r--reentr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/reentr.c b/reentr.c
index 8dddbe7665..a2f1a19681 100644
--- a/reentr.c
+++ b/reentr.c
@@ -146,7 +146,7 @@ Perl_reentrant_init(pTHX) {
New(31338, PL_reentrant_buffer->_asctime_buffer, PL_reentrant_buffer->_asctime_size, char);
#endif /* HAS_ASCTIME_R */
#ifdef HAS_CRYPT_R
-#ifdef __GLIBC__
+#if defined(__GLIBC__) || defined(__EMX__)
PL_reentrant_buffer->_crypt_struct.initialized = 0;
/* work around glibc-2.2.5 bug */
PL_reentrant_buffer->_crypt_struct.current_saltbits = 0;