Monster _r patch: try to scan for all known _r variants,

and then use them (under ithreads).  May fail in HP-UX,
and the op/groups is known to be fickle everywhere.  Known
to work in Solaris, Linux, Tru64, IRIX, AIX.  (Some compiler
warnings in AIX since the first arguments of getnetbyaddr
and getnetbyadd_r are of different types.  Thanks, IBM.)

In non-Configure platforms deny the existence of any
of the _r thingies.  (Also add the recently introduced
d_tm_* to places it wasn't already in.)

TODO: the suggested glibc buffer growth retry loop in case
some entries (at least for: gr*, host*) are big.
Forgot win32/config.win64.

p4raw-id: //depot/perl@15238

5 files changed, 312 insertions, 13 deletions

diff --git a/win32/Makefile b/win32/Makefile
index b1c7beee03..2734229a82 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -486,6 +486,7 @@ MICROCORE_SRC	=		\
 		..\pp_pack.c	\
 		..\pp_sort.c	\
 		..\pp_sys.c	\
+		..\reentr.c	\
 		..\regcomp.c	\
 		..\regexec.c	\
 		..\run.c	\
diff --git a/win32/config.bc b/win32/config.bc
index 4c9bcc7336..81ddddabbe 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -29,6 +29,7 @@ archlibexp='~INST_TOP~~INST_VER~\lib~INST_ARCH~'
 archname64=''
 archname='MSWin32'
 archobjs=''
+asctime_r_proto='0'
 awk='awk'
 baserev='5'
 bash=''
@@ -68,8 +69,11 @@ cppminus=''
 cpprun='cpp32 -oCON'
 cppstdin='cppstdin'
 cppsymbols=''
+crypt_r_proto='0'
 cryptlib=''
 csh='undef'
+ctermid_r_proto='0'
+ctime_r_proto='0'
 d_Gconvert='gcvt((x),(n),(b))'
 d_PRIEUldbl='undef'
 d_PRIFUldbl='undef'
@@ -88,6 +92,7 @@ d_access='define'
 d_accessx='undef'
 d_alarm='define'
 d_archlib='define'
+d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
 d_attribut='undef'
@@ -109,26 +114,36 @@ d_closedir='define'
 d_cmsghdr_s='undef'
 d_const='define'
 d_crypt='undef'
+d_crypt_r='undef'
 d_csh='undef'
+d_ctermid_r='undef'
+d_ctime_r='undef'
 d_cuserid='undef'
 d_dbl_dig='define'
 d_dbminitproto='undef'
 d_difftime='define'
-d_dirnamlen='define'
 d_dirfd='undef'
+d_dirnamlen='define'
 d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
 d_dosuid='undef'
+d_drand48_r='undef'
 d_drand48proto='undef'
 d_dup2='define'
 d_eaccess='undef'
 d_endgrent='undef'
+d_endgrent_r='undef'
 d_endhent='undef'
+d_endhostent_r='undef'
 d_endnent='undef'
+d_endnetent_r='undef'
 d_endpent='undef'
+d_endprotoent_r='undef'
 d_endpwent='undef'
+d_endpwent_r='undef'
 d_endsent='undef'
+d_endservent_r='undef'
 d_eofnblk='define'
 d_eunice='undef'
 d_fchdir='undef'
@@ -165,19 +180,29 @@ d_getcwd='define'
 d_getespwnam='undef'
 d_getfsstat='undef'
 d_getgrent='undef'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
 d_getgrps='undef'
 d_gethbyaddr='define'
 d_gethbyname='define'
 d_gethent='undef'
 d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
 d_gethostprotos='define'
 d_getitimer='undef'
 d_getlogin='define'
+d_getlogin_r='undef'
 d_getmnt='undef'
 d_getmntent='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
 d_getnent='undef'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
 d_getnetprotos='undef'
 d_getpagsz='undef'
 d_getpbyname='define'
@@ -188,15 +213,26 @@ d_getpgrp2='undef'
 d_getpgrp='undef'
 d_getppid='undef'
 d_getprior='undef'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
 d_getprotoprotos='define'
 d_getprpwnam='undef'
 d_getpwent='undef'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
 d_getsbyname='define'
 d_getsbyport='define'
 d_getsent='undef'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
 d_getservprotos='define'
 d_getspnam='undef'
+d_getspnam_r='undef'
 d_gettimeod='undef'
+d_gmtime_r='undef'
 d_gnulibc='undef'
 d_grpasswd='undef'
 d_hasmntopt='undef'
@@ -213,6 +249,7 @@ d_killpg='undef'
 d_lchown='undef'
 d_ldbl_dig='define'
 d_link='define'
+d_localtime_r='undef'
 d_locconv='define'
 d_lockf='undef'
 d_longdbl='define'
@@ -281,7 +318,10 @@ d_pwpasswd='undef'
 d_pwquota='undef'
 d_qgcvt='undef'
 d_quad='undef'
+d_random_r='undef'
+d_readdir64_r='undef'
 d_readdir='define'
+d_readdir_r='undef'
 d_readlink='undef'
 d_readv='undef'
 d_recvmsg='undef'
@@ -306,18 +346,24 @@ d_sendmsg='undef'
 d_setegid='undef'
 d_seteuid='undef'
 d_setgrent='undef'
+d_setgrent_r='undef'
 d_setgrps='undef'
 d_sethent='undef'
+d_sethostent_r='undef'
 d_setitimer='undef'
 d_setlinebuf='undef'
 d_setlocale='define'
+d_setlocale_r='undef'
 d_setnent='undef'
+d_setnetent_r='undef'
 d_setpent='undef'
 d_setpgid='undef'
 d_setpgrp2='undef'
 d_setpgrp='undef'
 d_setprior='undef'
+d_setprotoent_r='undef'
 d_setpwent='undef'
+d_setpwent_r='undef'
 d_setregid='undef'
 d_setresgid='undef'
 d_setresuid='undef'
@@ -325,6 +371,7 @@ d_setreuid='undef'
 d_setrgid='undef'
 d_setruid='undef'
 d_setsent='undef'
+d_setservent_r='undef'
 d_setsid='undef'
 d_setvbuf='define'
 d_sfio='undef'
@@ -344,6 +391,8 @@ d_socklen_t='undef'
 d_sockpair='undef'
 d_socks5_init='undef'
 d_sqrtl='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
@@ -362,6 +411,7 @@ d_strcoll='define'
 d_strctcpy='define'
 d_strerrm='strerror(e)'
 d_strerror='define'
+d_strerror_r='undef'
 d_strftime='define'
 d_strtod='define'
 d_strtol='define'
@@ -386,7 +436,11 @@ d_telldir='define'
 d_telldirproto='define'
 d_time='define'
 d_times='define'
+d_tm_tm_gmtoff='undef'
+d_tm_tm_zone='undef'
+d_tmpnam_r='undef'
 d_truncate='undef'
+d_ttyname_r='undef'
 d_tzname='define'
 d_u32align='define'
 d_ualarm='undef'
@@ -421,12 +475,19 @@ dlext='dll'
 dlsrc='dl_win32.xs'
 doublesize='8'
 drand01='(rand()/(double)((unsigned)1<<RANDBITS))'
+drand48_r_proto='0'
 dynamic_ext='Socket IO Fcntl Opcode SDBM_File attrs Thread'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
 egrep='egrep'
 emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
 eunicefix=':'
 exe_ext='.exe'
 expr='expr'
@@ -443,11 +504,32 @@ full_ar=''
 full_csh=''
 full_sed=''
 gccversion=''
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
 gidformat='"d"'
 gidsign='-1'
 gidsize='4'
 gidtype='gid_t'
 glibpth='/usr/shlib  /lib/pa1.1 /usr/lib/large /lib /usr/lib /usr/lib/386 /lib/386 /lib/large /usr/lib/small /lib/small /usr/ccs/lib /usr/ucblib /usr/shlib '
+gmtime_r_proto='0'
 grep='grep'
 groupcat=''
 groupstype='gid_t'
@@ -466,6 +548,7 @@ i8size='1'
 i8type='char'
 i_arpainet='define'
 i_bsdioctl=''
+i_crypt='undef'
 i_db='undef'
 i_dbm='undef'
 i_dirent='define'
@@ -522,9 +605,9 @@ i_sysresrc='undef'
 i_syssecrt='undef'
 i_sysselct='undef'
 i_syssockio='undef'
+i_sysstat='define'
 i_sysstatfs='undef'
 i_sysstatvfs='undef'
-i_sysstat='define'
 i_systime='undef'
 i_systimek='undef'
 i_systimes='undef'
@@ -551,12 +634,12 @@ incpath=''
 inews=''
 installarchlib='~INST_TOP~~INST_VER~\lib~INST_ARCH~'
 installbin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
+installhtmldir='~INST_TOP~~INST_VER~\html'
+installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp'
 installman1dir='~INST_TOP~~INST_VER~\man\man1'
 installman3dir='~INST_TOP~~INST_VER~\man\man3'
 installprefix='~INST_TOP~~INST_VER~'
 installprefixexp='~INST_TOP~~INST_VER~'
-installhtmldir='~INST_TOP~~INST_VER~\html'
-installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp'
 installprivlib='~INST_TOP~~INST_VER~\lib'
 installscript='~INST_TOP~~INST_VER~\bin'
 installsitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
@@ -594,6 +677,7 @@ lint=''
 lkflags=''
 ln=''
 lns='copy'
+localtime_r_proto='0'
 locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
 loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
 longdblsize='10'
@@ -694,9 +778,12 @@ quadkind='5'
 quadtype='__int64'
 randbits='15'
 randfunc='rand'
+random_r_proto='0'
 randseedtype='unsigned'
 ranlib='rem'
 rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
 revision='5'
 rm='del'
 rmail=''
@@ -721,6 +808,13 @@ seedfunc='srand'
 selectminbits='32'
 selecttype='Perl_fd_set *'
 sendmail='blat'
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
 sh='cmd /x /c'
 shar=''
 sharpbang='#!'
@@ -754,6 +848,8 @@ socksizetype='int'
 sort='sort'
 spackage='Perl5'
 spitshell=''
+srand48_r_proto='0'
+srandom_r_proto='0'
 src=''
 ssizetype='int'
 startperl='#!perl'
@@ -766,6 +862,7 @@ stdio_cnt='((fp)->level)'
 stdio_filbuf=''
 stdio_ptr='((fp)->curp)'
 stdio_stream_array=''
+strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
 subversion='~SUBVERSION~'
@@ -777,10 +874,12 @@ tee=''
 test=''
 timeincl='/usr/include/sys/time.h '
 timetype='time_t'
+tmpnam_r_proto='0'
 touch='touch'
 tr=''
 trnl='\012'
 troff=''
+ttyname_r_proto='0'
 u16size='2'
 u16type='unsigned short'
 u32size='4'
@@ -820,12 +919,12 @@ usevendorprefix='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
+uvXUformat='"lX"'
 uvoformat='"lo"'
 uvsize='4'
 uvtype='unsigned long'
 uvuformat='"lu"'
 uvxformat='"lx"'
-uvXUformat='"lX"'
 vendorarch=''
 vendorarchexp=''
 vendorbin=''
diff --git a/win32/config.gc b/win32/config.gc
index 2587a1a5c5..f3f057e15c 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -11,6 +11,105 @@ RCSfile='$RCSfile'
 Revision='$Revision'
 Source=''
 State=''
+asctime_r_proto='0'
+crypt_r_proto='0'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_asctime_r='undef'
+d_crypt_r='undef'
+d_ctermid_r='undef'
+d_ctime_r='undef'
+d_drand48_r='undef'
+d_endgrent_r='undef'
+d_endhostent_r='undef'
+d_endnetent_r='undef'
+d_endprotoent_r='undef'
+d_endpwent_r='undef'
+d_endservent_r='undef'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_getlogin_r='undef'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getspnam_r='undef'
+d_gmtime_r='undef'
+d_localtime_r='undef'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir_r='undef'
+d_setgrent_r='undef'
+d_sethostent_r='undef'
+d_setlocale_r='undef'
+d_setnetent_r='undef'
+d_setprotoent_r='undef'
+d_setpwent_r='undef'
+d_setservent_r='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_strerror_r='undef'
+d_tmpnam_r='undef'
+d_ttyname_r='undef'
+drand48_r_proto='0'
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gmtime_r_proto='0'
+i_crypt='undef'
+localtime_r_proto='0'
+random_r_proto='0'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+srand48_r_proto='0'
+srandom_r_proto='0'
+strerror_r_proto='0'
+tmpnam_r_proto='0'
+ttyname_r_proto='0'
+d_tm_tm_gmtoff='undef'
+d_tm_tm_zone='undef'
 _a='.a'
 _exe='.exe'
 _o='.o'
@@ -522,9 +621,9 @@ i_sysresrc='undef'
 i_syssecrt='undef'
 i_sysselct='undef'
 i_syssockio='undef'
+i_sysstat='define'
 i_sysstatfs='undef'
 i_sysstatvfs='undef'
-i_sysstat='define'
 i_systime='undef'
 i_systimek='undef'
 i_systimes='undef'
@@ -551,12 +650,12 @@ incpath=''
 inews=''
 installarchlib='~INST_TOP~~INST_VER~\lib~INST_ARCH~'
 installbin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
+installhtmldir='~INST_TOP~~INST_VER~\html'
+installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp'
 installman1dir='~INST_TOP~~INST_VER~\man\man1'
 installman3dir='~INST_TOP~~INST_VER~\man\man3'
 installprefix='~INST_TOP~~INST_VER~'
 installprefixexp='~INST_TOP~~INST_VER~'
-installhtmldir='~INST_TOP~~INST_VER~\html'
-installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp'
 installprivlib='~INST_TOP~~INST_VER~\lib'
 installscript='~INST_TOP~~INST_VER~\bin'
 installsitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
@@ -820,12 +919,12 @@ usevendorprefix='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
+uvXUformat='"lX"'
 uvoformat='"lo"'
 uvsize='4'
 uvtype='unsigned long'
 uvuformat='"lu"'
 uvxformat='"lx"'
-uvXUformat='"lX"'
 vendorarch=''
 vendorarchexp=''
 vendorbin=''
diff --git a/win32/config.vc b/win32/config.vc
index 588c454807..b7b8a9d0cb 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -29,6 +29,7 @@ archlibexp='~INST_TOP~~INST_VER~\lib~INST_ARCH~'
 archname64=''
 archname='MSWin32'
 archobjs=''
+asctime_r_proto='0'
 awk='awk'
 baserev='5'
 bash=''
@@ -68,8 +69,11 @@ cppminus=''
 cpprun='cl -nologo -E'
 cppstdin='cppstdin'
 cppsymbols=''
+crypt_r_proto='0'
 cryptlib=''
 csh='undef'
+ctermid_r_proto='0'
+ctime_r_proto='0'
 d_Gconvert='sprintf((b),"%.*g",(n),(x))'
 d_PRIEUldbl='undef'
 d_PRIFUldbl='undef'
@@ -88,6 +92,7 @@ d_access='define'
 d_accessx='undef'
 d_alarm='define'
 d_archlib='define'
+d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
 d_attribut='undef'
@@ -109,7 +114,10 @@ d_closedir='define'
 d_cmsghdr_s='undef'
 d_const='define'
 d_crypt='undef'
+d_crypt_r='undef'
 d_csh='undef'
+d_ctermid_r='undef'
+d_ctime_r='undef'
 d_cuserid='undef'
 d_dbl_dig='define'
 d_dbminitproto='undef'
@@ -120,15 +128,22 @@ d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
 d_dosuid='undef'
+d_drand48_r='undef'
 d_drand48proto='undef'
 d_dup2='define'
 d_eaccess='undef'
 d_endgrent='undef'
+d_endgrent_r='undef'
 d_endhent='undef'
+d_endhostent_r='undef'
 d_endnent='undef'
+d_endnetent_r='undef'
 d_endpent='undef'
+d_endprotoent_r='undef'
 d_endpwent='undef'
+d_endpwent_r='undef'
 d_endsent='undef'
+d_endservent_r='undef'
 d_eofnblk='define'
 d_eunice='undef'
 d_fchdir='undef'
@@ -165,19 +180,29 @@ d_getcwd='define'
 d_getespwnam='undef'
 d_getfsstat='undef'
 d_getgrent='undef'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
 d_getgrps='undef'
 d_gethbyaddr='define'
 d_gethbyname='define'
 d_gethent='undef'
 d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
 d_gethostprotos='define'
 d_getitimer='undef'
 d_getlogin='define'
+d_getlogin_r='undef'
 d_getmnt='undef'
 d_getmntent='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
 d_getnent='undef'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
 d_getnetprotos='undef'
 d_getpagsz='undef'
 d_getpbyname='define'
@@ -188,15 +213,26 @@ d_getpgrp2='undef'
 d_getpgrp='undef'
 d_getppid='undef'
 d_getprior='undef'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
 d_getprotoprotos='define'
 d_getprpwnam='undef'
 d_getpwent='undef'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
 d_getsbyname='define'
 d_getsbyport='define'
 d_getsent='undef'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
 d_getservprotos='define'
 d_getspnam='undef'
+d_getspnam_r='undef'
 d_gettimeod='undef'
+d_gmtime_r='undef'
 d_gnulibc='undef'
 d_grpasswd='undef'
 d_hasmntopt='undef'
@@ -213,6 +249,7 @@ d_killpg='undef'
 d_lchown='undef'
 d_ldbl_dig='define'
 d_link='define'
+d_localtime_r='undef'
 d_locconv='define'
 d_lockf='undef'
 d_longdbl='define'
@@ -281,7 +318,10 @@ d_pwpasswd='undef'
 d_pwquota='undef'
 d_qgcvt='undef'
 d_quad='undef'
+d_random_r='undef'
+d_readdir64_r='undef'
 d_readdir='define'
+d_readdir_r='undef'
 d_readlink='undef'
 d_readv='undef'
 d_recvmsg='undef'
@@ -306,18 +346,24 @@ d_sendmsg='undef'
 d_setegid='undef'
 d_seteuid='undef'
 d_setgrent='undef'
+d_setgrent_r='undef'
 d_setgrps='undef'
 d_sethent='undef'
+d_sethostent_r='undef'
 d_setitimer='undef'
 d_setlinebuf='undef'
 d_setlocale='define'
+d_setlocale_r='undef'
 d_setnent='undef'
+d_setnetent_r='undef'
 d_setpent='undef'
 d_setpgid='undef'
 d_setpgrp2='undef'
 d_setpgrp='undef'
 d_setprior='undef'
+d_setprotoent_r='undef'
 d_setpwent='undef'
+d_setpwent_r='undef'
 d_setregid='undef'
 d_setresgid='undef'
 d_setresuid='undef'
@@ -325,6 +371,7 @@ d_setreuid='undef'
 d_setrgid='undef'
 d_setruid='undef'
 d_setsent='undef'
+d_setservent_r='undef'
 d_setsid='undef'
 d_setvbuf='define'
 d_sfio='undef'
@@ -344,6 +391,8 @@ d_socklen_t='undef'
 d_sockpair='undef'
 d_socks5_init='undef'
 d_sqrtl='undef'
+d_srand48_r='undef'
+d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
@@ -362,6 +411,7 @@ d_strcoll='define'
 d_strctcpy='define'
 d_strerrm='strerror(e)'
 d_strerror='define'
+d_strerror_r='undef'
 d_strftime='define'
 d_strtod='define'
 d_strtol='define'
@@ -386,7 +436,11 @@ d_telldir='define'
 d_telldirproto='define'
 d_time='define'
 d_times='define'
+d_tm_tm_gmtoff='undef'
+d_tm_tm_zone='undef'
+d_tmpnam_r='undef'
 d_truncate='undef'
+d_ttyname_r='undef'
 d_tzname='define'
 d_u32align='define'
 d_ualarm='undef'
@@ -421,12 +475,19 @@ dlext='dll'
 dlsrc='dl_win32.xs'
 doublesize='8'
 drand01='(rand()/(double)((unsigned)1<<RANDBITS))'
+drand48_r_proto='0'
 dynamic_ext='Socket IO Fcntl Opcode SDBM_File attrs Thread'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
 egrep='egrep'
 emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
 eunicefix=':'
 exe_ext='.exe'
 expr='expr'
@@ -443,11 +504,32 @@ full_ar=''
 full_csh=''
 full_sed=''
 gccversion=''
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
 gidformat='"ld"'
 gidsign='-1'
 gidsize='4'
 gidtype='gid_t'
 glibpth='/usr/shlib  /lib/pa1.1 /usr/lib/large /lib /usr/lib /usr/lib/386 /lib/386 /lib/large /usr/lib/small /lib/small /usr/ccs/lib /usr/ucblib /usr/shlib '
+gmtime_r_proto='0'
 grep='grep'
 groupcat=''
 groupstype='gid_t'
@@ -466,6 +548,7 @@ i8size='1'
 i8type='char'
 i_arpainet='define'
 i_bsdioctl=''
+i_crypt='undef'
 i_db='undef'
 i_dbm='undef'
 i_dirent='define'
@@ -522,9 +605,9 @@ i_sysresrc='undef'
 i_syssecrt='undef'
 i_sysselct='undef'
 i_syssockio='undef'
+i_sysstat='define'
 i_sysstatfs='undef'
 i_sysstatvfs='undef'
-i_sysstat='define'
 i_systime='undef'
 i_systimek='undef'
 i_systimes='undef'
@@ -551,12 +634,12 @@ incpath=''
 inews=''
 installarchlib='~INST_TOP~~INST_VER~\lib~INST_ARCH~'
 installbin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
+installhtmldir='~INST_TOP~~INST_VER~\html'
+installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp'
 installman1dir='~INST_TOP~~INST_VER~\man\man1'
 installman3dir='~INST_TOP~~INST_VER~\man\man3'
 installprefix='~INST_TOP~~INST_VER~'
 installprefixexp='~INST_TOP~~INST_VER~'
-installhtmldir='~INST_TOP~~INST_VER~\html'
-installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp'
 installprivlib='~INST_TOP~~INST_VER~\lib'
 installscript='~INST_TOP~~INST_VER~\bin'
 installsitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
@@ -594,6 +677,7 @@ lint=''
 lkflags=''
 ln=''
 lns='copy'
+localtime_r_proto='0'
 locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
 loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
 longdblsize='10'
@@ -694,9 +778,12 @@ quadkind='5'
 quadtype='__int64'
 randbits='15'
 randfunc='rand'
+random_r_proto='0'
 randseedtype='unsigned'
 ranlib='rem'
 rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
 revision='5'
 rm='del'
 rmail=''
@@ -721,6 +808,13 @@ seedfunc='srand'
 selectminbits='32'
 selecttype='Perl_fd_set *'
 sendmail='blat'
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
 sh='cmd /x /c'
 shar=''
 sharpbang='#!'
@@ -754,6 +848,8 @@ socksizetype='int'
 sort='sort'
 spackage='Perl5'
 spitshell=''
+srand48_r_proto='0'
+srandom_r_proto='0'
 src=''
 ssizetype='int'
 startperl='#!perl'
@@ -766,6 +862,7 @@ stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
 stdio_stream_array=''
+strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
 subversion='~SUBVERSION~'
@@ -777,10 +874,12 @@ tee=''
 test=''
 timeincl='/usr/include/sys/time.h '
 timetype='time_t'
+tmpnam_r_proto='0'
 touch='touch'
 tr=''
 trnl='\012'
 troff=''
+ttyname_r_proto='0'
 u16size='2'
 u16type='unsigned short'
 u32size='4'
@@ -820,12 +919,12 @@ usevendorprefix='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
+uvXUformat='"lX"'
 uvoformat='"lo"'
 uvsize='4'
 uvtype='unsigned long'
 uvuformat='"lu"'
 uvxformat='"lx"'
-uvXUformat='"lX"'
 vendorarch=''
 vendorarchexp=''
 vendorbin=''
diff --git a/win32/makefile.mk b/win32/makefile.mk
index a4cf314e6e..23717c408c 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -646,6 +646,7 @@ MICROCORE_SRC	=		\
 		..\pp_pack.c	\
 		..\pp_sort.c	\
 		..\pp_sys.c	\
+		..\reentr.c	\
 		..\regcomp.c	\
 		..\regexec.c	\
 		..\run.c	\