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

4 files changed, 982 insertions, 7 deletions

diff --git a/Porting/Glossary b/Porting/Glossary
index c267c5e070..f8f5470ec5 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -118,6 +118,9 @@ archobjs (Unix.U):
 	or other facilities.  For perl on OS/2, for example, this would
 	include os2/os2.obj.
 
+asctime_r_proto (d_asctime_r.U):
+	This variable encodes the prototype of asctime_r.
+
 awk (Loc.U):
 	This variable is used internally by Configure to determine the
 	full pathname (if any) of the awk program.  After Configure runs,
@@ -329,6 +332,9 @@ cppsymbols (Cppsym.U):
 	not in this list, see ccsymbols and cppccsymbols.
 	The list is a space-separated list of symbol=value tokens.
 
+crypt_r_proto (d_crypt_r.U):
+	This variable encodes the prototype of crypt_r.
+
 cryptlib (d_crypt.U):
 	This variable holds -lcrypt or the path to a libcrypt.a archive if
 	the crypt() function is not defined in the standard C library. It is
@@ -339,6 +345,12 @@ csh (Loc.U):
 	full pathname (if any) of the csh program.  After Configure runs,
 	the value is reset to a plain "csh" and is not useful.
 
+ctermid_r_proto (d_ctermid_r.U):
+	This variable encodes the prototype of ctermid_r.
+
+ctime_r_proto (d_ctime_r.U):
+	This variable encodes the prototype of ctime_r.
+
 d__fwalk (d__fwalk.U):
 	This variable conditionally defines HAS__FWALK if _fwalk() is
 	available to apply a function to all the file handles.
@@ -360,6 +372,11 @@ d_archlib (archlib.U):
 	of architecture-dependent library files for $package.  If
 	$archlib is the same as $privlib, then this is set to undef.
 
+d_asctime_r (d_asctime_r.U):
+	This variable conditionally defines the HAS_ASCTIME_R symbol,
+	which indicates to the C program that the asctime_r()
+	routine is available.
+
 d_atolf (atolf.U):
 	This variable conditionally defines the HAS_ATOLF symbol, which
 	indicates to the C program that the atolf() routine is available.
@@ -453,10 +470,25 @@ d_crypt (d_crypt.U):
 	indicates to the C program that the crypt() routine is available
 	to encrypt passwords and the like.
 
+d_crypt_r (d_crypt_r.U):
+	This variable conditionally defines the HAS_CRYPT_R symbol,
+	which indicates to the C program that the crypt_r()
+	routine is available.
+
 d_csh (d_csh.U):
 	This variable conditionally defines the CSH symbol, which
 	indicates to the C program that the C-shell exists.
 
+d_ctermid_r (d_ctermid_r.U):
+	This variable conditionally defines the HAS_CTERMID_R symbol,
+	which indicates to the C program that the ctermid_r()
+	routine is available.
+
+d_ctime_r (d_ctime_r.U):
+	This variable conditionally defines the HAS_CTIME_R symbol,
+	which indicates to the C program that the ctime_r()
+	routine is available.
+
 d_cuserid (d_cuserid.U):
 	This variable conditionally defines the HAS_CUSERID symbol, which
 	indicates to the C program that the cuserid() routine is available
@@ -505,6 +537,11 @@ d_dosuid (d_dosuid.U):
 	tells the C program that it should insert setuid emulation code
 	on hosts which have setuid #! scripts disabled.
 
+d_drand48_r (d_drand48_r.U):
+	This variable conditionally defines the HAS_DRAND48_R symbol,
+	which indicates to the C program that the drand48_r()
+	routine is available.
+
 d_drand48proto (d_drand48proto.U):
 	This variable conditionally defines the HAS_DRAND48_PROTO symbol,
 	which indicates to the C program that the system provides
@@ -524,27 +561,57 @@ d_endgrent (d_endgrent.U):
 	indicates to the C program that the endgrent() routine is available
 	for sequential access of the group database.
 
+d_endgrent_r (d_endgrent_r.U):
+	This variable conditionally defines the HAS_ENDGRENT_R symbol,
+	which indicates to the C program that the endgrent_r()
+	routine is available.
+
 d_endhent (d_endhent.U):
 	This variable conditionally defines HAS_ENDHOSTENT if endhostent() is
 	available to close whatever was being used for host queries.
 
+d_endhostent_r (d_endhostent_r.U):
+	This variable conditionally defines the HAS_ENDHOSTENT_R symbol,
+	which indicates to the C program that the endhostent_r()
+	routine is available.
+
 d_endnent (d_endnent.U):
 	This variable conditionally defines HAS_ENDNETENT if endnetent() is
 	available to close whatever was being used for network queries.
 
+d_endnetent_r (d_endnetent_r.U):
+	This variable conditionally defines the HAS_ENDNETENT_R symbol,
+	which indicates to the C program that the endnetent_r()
+	routine is available.
+
 d_endpent (d_endpent.U):
 	This variable conditionally defines HAS_ENDPROTOENT if endprotoent() is
 	available to close whatever was being used for protocol queries.
 
+d_endprotoent_r (d_endprotoent_r.U):
+	This variable conditionally defines the HAS_ENDPROTOENT_R symbol,
+	which indicates to the C program that the endprotoent_r()
+	routine is available.
+
 d_endpwent (d_endpwent.U):
 	This variable conditionally defines the HAS_ENDPWENT symbol, which
 	indicates to the C program that the endpwent() routine is available
 	for sequential access of the passwd database.
 
+d_endpwent_r (d_endpwent_r.U):
+	This variable conditionally defines the HAS_ENDPWENT_R symbol,
+	which indicates to the C program that the endpwent_r()
+	routine is available.
+
 d_endsent (d_endsent.U):
 	This variable conditionally defines HAS_ENDSERVENT if endservent() is
 	available to close whatever was being used for service queries.
 
+d_endservent_r (d_endservent_r.U):
+	This variable conditionally defines the HAS_ENDSERVENT_R symbol,
+	which indicates to the C program that the endservent_r()
+	routine is available.
+
 d_eofnblk (nblock_io.U):
 	This variable conditionally defines EOF_NONBLOCK if EOF can be seen
 	when reading from a non-blocking I/O source.
@@ -721,6 +788,21 @@ d_getgrent (d_getgrent.U):
 	indicates to the C program that the getgrent() routine is available
 	for sequential access of the group database.
 
+d_getgrent_r (d_getgrent_r.U):
+	This variable conditionally defines the HAS_GETGRENT_R symbol,
+	which indicates to the C program that the getgrent_r()
+	routine is available.
+
+d_getgrgid_r (d_getgrgid_r.U):
+	This variable conditionally defines the HAS_GETGRGID_R symbol,
+	which indicates to the C program that the getgrgid_r()
+	routine is available.
+
+d_getgrnam_r (d_getgrnam_r.U):
+	This variable conditionally defines the HAS_GETGRNAM_R symbol,
+	which indicates to the C program that the getgrnam_r()
+	routine is available.
+
 d_getgrps (d_getgrps.U):
 	This variable conditionally defines the HAS_GETGROUPS symbol, which
 	indicates to the C program that the getgroups() routine is available
@@ -745,6 +827,21 @@ d_gethname (d_gethname.U):
 	indicates to the C program that the gethostname() routine may be
 	used to derive the host name.
 
+d_gethostbyaddr_r (d_gethostbyaddr_r.U):
+	This variable conditionally defines the HAS_GETHOSTBYADDR_R symbol,
+	which indicates to the C program that the gethostbyaddr_r()
+	routine is available.
+
+d_gethostbyname_r (d_gethostbyname_r.U):
+	This variable conditionally defines the HAS_GETHOSTBYNAME_R symbol,
+	which indicates to the C program that the gethostbyname_r()
+	routine is available.
+
+d_gethostent_r (d_gethostent_r.U):
+	This variable conditionally defines the HAS_GETHOSTENT_R symbol,
+	which indicates to the C program that the gethostent_r()
+	routine is available.
+
 d_gethostprotos (d_gethostprotos.U):
 	This variable conditionally defines the HAS_GETHOST_PROTOS symbol,
 	which indicates to the C program that <netdb.h> supplies
@@ -760,6 +857,11 @@ d_getlogin (d_getlogin.U):
 	indicates to the C program that the getlogin() routine is available
 	to get the login name.
 
+d_getlogin_r (d_getlogin_r.U):
+	This variable conditionally defines the HAS_GETLOGIN_R symbol,
+	which indicates to the C program that the getlogin_r()
+	routine is available.
+
 d_getmnt (d_getmnt.U):
 	This variable conditionally defines the HAS_GETMNT symbol, which
 	indicates to the C program that the getmnt() routine is available
@@ -784,6 +886,21 @@ d_getnent (d_getnent.U):
 	This variable conditionally defines HAS_GETNETENT if getnetent() is
 	available to look up network names in some data base or another.
 
+d_getnetbyaddr_r (d_getnetbyaddr_r.U):
+	This variable conditionally defines the HAS_GETNETBYADDR_R symbol,
+	which indicates to the C program that the getnetbyaddr_r()
+	routine is available.
+
+d_getnetbyname_r (d_getnetbyname_r.U):
+	This variable conditionally defines the HAS_GETNETBYNAME_R symbol,
+	which indicates to the C program that the getnetbyname_r()
+	routine is available.
+
+d_getnetent_r (d_getnetent_r.U):
+	This variable conditionally defines the HAS_GETNETENT_R symbol,
+	which indicates to the C program that the getnetent_r()
+	routine is available.
+
 d_getnetprotos (d_getnetprotos.U):
 	This variable conditionally defines the HAS_GETNET_PROTOS symbol,
 	which indicates to the C program that <netdb.h> supplies
@@ -833,6 +950,21 @@ d_getprior (d_getprior.U):
 	This variable conditionally defines HAS_GETPRIORITY if getpriority()
 	is available to get a process's priority.
 
+d_getprotobyname_r (d_getprotobyname_r.U):
+	This variable conditionally defines the HAS_GETPROTOBYNAME_R symbol,
+	which indicates to the C program that the getprotobyname_r()
+	routine is available.
+
+d_getprotobynumber_r (d_getprotobynumber_r.U):
+	This variable conditionally defines the HAS_GETPROTOBYNUMBER_R symbol,
+	which indicates to the C program that the getprotobynumber_r()
+	routine is available.
+
+d_getprotoent_r (d_getprotoent_r.U):
+	This variable conditionally defines the HAS_GETPROTOENT_R symbol,
+	which indicates to the C program that the getprotoent_r()
+	routine is available.
+
 d_getprotoprotos (d_getprotoprotos.U):
 	This variable conditionally defines the HAS_GETPROTO_PROTOS symbol,
 	which indicates to the C program that <netdb.h> supplies
@@ -848,6 +980,21 @@ d_getpwent (d_getpwent.U):
 	indicates to the C program that the getpwent() routine is available
 	for sequential access of the passwd database.
 
+d_getpwent_r (d_getpwent_r.U):
+	This variable conditionally defines the HAS_GETPWENT_R symbol,
+	which indicates to the C program that the getpwent_r()
+	routine is available.
+
+d_getpwnam_r (d_getpwnam_r.U):
+	This variable conditionally defines the HAS_GETPWNAM_R symbol,
+	which indicates to the C program that the getpwnam_r()
+	routine is available.
+
+d_getpwuid_r (d_getpwuid_r.U):
+	This variable conditionally defines the HAS_GETPWUID_R symbol,
+	which indicates to the C program that the getpwuid_r()
+	routine is available.
+
 d_getsbyname (d_getsrvby.U):
 	This variable conditionally defines the HAS_GETSERVBYNAME 
 	symbol, which indicates to the C program that the 
@@ -864,6 +1011,21 @@ d_getsent (d_getsent.U):
 	This variable conditionally defines HAS_GETSERVENT if getservent() is
 	available to look up network services in some data base or another.
 
+d_getservbyname_r (d_getservbyname_r.U):
+	This variable conditionally defines the HAS_GETSERVBYNAME_R symbol,
+	which indicates to the C program that the getservbyname_r()
+	routine is available.
+
+d_getservbyport_r (d_getservbyport_r.U):
+	This variable conditionally defines the HAS_GETSERVBYPORT_R symbol,
+	which indicates to the C program that the getservbyport_r()
+	routine is available.
+
+d_getservent_r (d_getservent_r.U):
+	This variable conditionally defines the HAS_GETSERVENT_R symbol,
+	which indicates to the C program that the getservent_r()
+	routine is available.
+
 d_getservprotos (d_getservprotos.U):
 	This variable conditionally defines the HAS_GETSERV_PROTOS symbol,
 	which indicates to the C program that <netdb.h> supplies
@@ -874,11 +1036,21 @@ d_getspnam (d_getspnam.U):
 	This variable conditionally defines HAS_GETSPNAM if getspnam() is
 	available to retrieve SysV shadow password entries by name.
 
+d_getspnam_r (d_getspnam_r.U):
+	This variable conditionally defines the HAS_GETSPNAM_R symbol,
+	which indicates to the C program that the getspnam_r()
+	routine is available.
+
 d_gettimeod (d_ftime.U):
 	This variable conditionally defines the HAS_GETTIMEOFDAY symbol, which
 	indicates that the gettimeofday() system call exists (to obtain a
 	sub-second accuracy clock). You should probably include <sys/resource.h>.
 
+d_gmtime_r (d_gmtime_r.U):
+	This variable conditionally defines the HAS_GMTIME_R symbol,
+	which indicates to the C program that the gmtime_r()
+	routine is available.
+
 d_gnulibc (d_gnulibc.U):
 	Defined if we're dealing with the GNU C Library.
 
@@ -946,6 +1118,11 @@ d_link (d_link.U):
 	This variable conditionally defines HAS_LINK if link() is
 	available to create hard links.
 
+d_localtime_r (d_localtime_r.U):
+	This variable conditionally defines the HAS_LOCALTIME_R symbol,
+	which indicates to the C program that the localtime_r()
+	routine is available.
+
 d_locconv (d_locconv.U):
 	This variable conditionally defines HAS_LOCALECONV if localeconv() is
 	available for numeric and monetary formatting conventions.
@@ -1311,10 +1488,25 @@ d_quad (quadtype.U):
 	This variable, if defined, tells that there's a 64-bit integer type,
 	quadtype.
 
+d_random_r (d_random_r.U):
+	This variable conditionally defines the HAS_RANDOM_R symbol,
+	which indicates to the C program that the random_r()
+	routine is available.
+
+d_readdir64_r (d_readdir64_r.U):
+	This variable conditionally defines the HAS_READDIR64_R symbol,
+	which indicates to the C program that the readdir64_r()
+	routine is available.
+
 d_readdir (d_readdir.U):
 	This variable conditionally defines HAS_READDIR if readdir() is
 	available to read directory entries.
 
+d_readdir_r (d_readdir_r.U):
+	This variable conditionally defines the HAS_READDIR_R symbol,
+	which indicates to the C program that the readdir_r()
+	routine is available.
+
 d_readlink (d_readlink.U):
 	This variable conditionally defines the HAS_READLINK symbol, which
 	indicates to the C program that the readlink() routine is available
@@ -1428,6 +1620,11 @@ d_setgrent (d_setgrent.U):
 	indicates to the C program that the setgrent() routine is available
 	for initializing sequential access to the group database.
 
+d_setgrent_r (d_setgrent_r.U):
+	This variable conditionally defines the HAS_SETGRENT_R symbol,
+	which indicates to the C program that the setgrent_r()
+	routine is available.
+
 d_setgrps (d_setgrps.U):
 	This variable conditionally defines the HAS_SETGROUPS symbol, which
 	indicates to the C program that the setgroups() routine is available
@@ -1437,6 +1634,11 @@ d_sethent (d_sethent.U):
 	This variable conditionally defines HAS_SETHOSTENT if sethostent() is
 	available.
 
+d_sethostent_r (d_sethostent_r.U):
+	This variable conditionally defines the HAS_SETHOSTENT_R symbol,
+	which indicates to the C program that the sethostent_r()
+	routine is available.
+
 d_setitimer (d_setitimer.U):
 	This variable conditionally defines the HAS_SETITIMER symbol, which
 	indicates to the C program that the setitimer() routine is available.
@@ -1451,10 +1653,20 @@ d_setlocale (d_setlocale.U):
 	This variable conditionally defines HAS_SETLOCALE if setlocale() is
 	available to handle locale-specific ctype implementations.
 
+d_setlocale_r (d_setlocale_r.U):
+	This variable conditionally defines the HAS_SETLOCALE_R symbol,
+	which indicates to the C program that the setlocale_r()
+	routine is available.
+
 d_setnent (d_setnent.U):
 	This variable conditionally defines HAS_SETNETENT if setnetent() is
 	available.
 
+d_setnetent_r (d_setnetent_r.U):
+	This variable conditionally defines the HAS_SETNETENT_R symbol,
+	which indicates to the C program that the setnetent_r()
+	routine is available.
+
 d_setpent (d_setpent.U):
 	This variable conditionally defines HAS_SETPROTOENT if setprotoent() is
 	available.
@@ -1481,11 +1693,21 @@ d_setproctitle (d_setproctitle.U):
 	which indicates to the C program that the setproctitle() routine
 	is available.
 
+d_setprotoent_r (d_setprotoent_r.U):
+	This variable conditionally defines the HAS_SETPROTOENT_R symbol,
+	which indicates to the C program that the setprotoent_r()
+	routine is available.
+
 d_setpwent (d_setpwent.U):
 	This variable conditionally defines the HAS_SETPWENT symbol, which
 	indicates to the C program that the setpwent() routine is available
 	for initializing sequential access to the passwd database.
 
+d_setpwent_r (d_setpwent_r.U):
+	This variable conditionally defines the HAS_SETPWENT_R symbol,
+	which indicates to the C program that the setpwent_r()
+	routine is available.
+
 d_setregid (d_setregid.U):
 	This variable conditionally defines HAS_SETREGID if setregid() is
 	available to change the real and effective gid of the current
@@ -1520,6 +1742,11 @@ d_setsent (d_setsent.U):
 	This variable conditionally defines HAS_SETSERVENT if setservent() is
 	available.
 
+d_setservent_r (d_setservent_r.U):
+	This variable conditionally defines the HAS_SETSERVENT_R symbol,
+	which indicates to the C program that the setservent_r()
+	routine is available.
+
 d_setsid (d_setsid.U):
 	This variable conditionally defines HAS_SETSID if setsid() is
 	available to set the process group ID.
@@ -1601,6 +1828,16 @@ d_sqrtl (d_sqrtl.U):
 	This variable conditionally defines the HAS_SQRTL symbol, which
 	indicates to the C program that the sqrtl() routine is available.
 
+d_srand48_r (d_srand48_r.U):
+	This variable conditionally defines the HAS_SRAND48_R symbol,
+	which indicates to the C program that the srand48_r()
+	routine is available.
+
+d_srandom_r (d_srandom_r.U):
+	This variable conditionally defines the HAS_SRANDOM_R symbol,
+	which indicates to the C program that the srandom_r()
+	routine is available.
+
 d_sresgproto (d_sresgproto.U):
 	This variable conditionally defines the HAS_SETRESGID_PROTO symbol,
 	which indicates to the C program that the system provides
@@ -1686,6 +1923,11 @@ d_strerror (d_strerror.U):
 	This variable conditionally defines HAS_STRERROR if strerror() is
 	available to translate error numbers to strings.
 
+d_strerror_r (d_strerror_r.U):
+	This variable conditionally defines the HAS_STRERROR_R symbol,
+	which indicates to the C program that the strerror_r()
+	routine is available.
+
 d_strftime (d_strftime.U):
 	This variable conditionally defines the HAS_STRFTIME symbol, which
 	indicates to the C program that the strftime() routine is available.
@@ -1803,10 +2045,20 @@ d_tm_tm_zone (i_time.U):
 	This variable conditionally defines HAS_TM_TM_ZONE, which indicates
 	indicates to the C program that the struct tm has the tm_zone field.
 
+d_tmpnam_r (d_tmpnam_r.U):
+	This variable conditionally defines the HAS_TMPNAM_R symbol,
+	which indicates to the C program that the tmpnam_r()
+	routine is available.
+
 d_truncate (d_truncate.U):
 	This variable conditionally defines HAS_TRUNCATE if truncate() is
 	available to truncate files.
 
+d_ttyname_r (d_ttyname_r.U):
+	This variable conditionally defines the HAS_TTYNAME_R symbol,
+	which indicates to the C program that the ttyname_r()
+	routine is available.
+
 d_tzname (d_tzname.U):
 	This variable conditionally defines HAS_TZNAME if tzname[] is
 	available to access timezone names.
@@ -1971,6 +2223,9 @@ drand01 (randfunc.U):
 	normalize the result.
 	In C programs, the macro 'Drand01' is mapped to drand01.
 
+drand48_r_proto (d_drand48_r.U):
+	This variable encodes the prototype of drand48_r.
+
 dynamic_ext (Extensions.U):
 	This variable holds a list of XS extension files we want to
 	link dynamically into the package.  It is used by Makefile.
@@ -2000,6 +2255,24 @@ emacs (Loc.U):
 	This variable is defined but not used by Configure.
 	The value is a plain '' and is not useful.
 
+endgrent_r_proto (d_endgrent_r.U):
+	This variable encodes the prototype of endgrent_r.
+
+endhostent_r_proto (d_endhostent_r.U):
+	This variable encodes the prototype of endhostent_r.
+
+endnetent_r_proto (d_endnetent_r.U):
+	This variable encodes the prototype of endnetent_r.
+
+endprotoent_r_proto (d_endprotoent_r.U):
+	This variable encodes the prototype of endprotoent_r.
+
+endpwent_r_proto (d_endpwent_r.U):
+	This variable encodes the prototype of endpwent_r.
+
+endservent_r_proto (d_endservent_r.U):
+	This variable encodes the prototype of endservent_r.
+
 eunicefix (Init.U):
 	When running under Eunice this variable contains a command which will
 	convert a shell script to the proper form of text file for it to be
@@ -2093,6 +2366,66 @@ gccversion (gccvers.U):
 	indicate whether the compiler is version 1 or 2.  This is used in
 	setting some of the default cflags.  It is set to '' if not gcc.
 
+getgrent_r_proto (d_getgrent_r.U):
+	This variable encodes the prototype of getgrent_r.
+
+getgrgid_r_proto (d_getgrgid_r.U):
+	This variable encodes the prototype of getgrgid_r.
+
+getgrnam_r_proto (d_getgrnam_r.U):
+	This variable encodes the prototype of getgrnam_r.
+
+gethostbyaddr_r_proto (d_gethostbyaddr_r.U):
+	This variable encodes the prototype of gethostbyaddr_r.
+
+gethostbyname_r_proto (d_gethostbyname_r.U):
+	This variable encodes the prototype of gethostbyname_r.
+
+gethostent_r_proto (d_gethostent_r.U):
+	This variable encodes the prototype of gethostent_r.
+
+getlogin_r_proto (d_getlogin_r.U):
+	This variable encodes the prototype of getlogin_r.
+
+getnetbyaddr_r_proto (d_getnetbyaddr_r.U):
+	This variable encodes the prototype of getnetbyaddr_r.
+
+getnetbyname_r_proto (d_getnetbyname_r.U):
+	This variable encodes the prototype of getnetbyname_r.
+
+getnetent_r_proto (d_getnetent_r.U):
+	This variable encodes the prototype of getnetent_r.
+
+getprotobyname_r_proto (d_getprotobyname_r.U):
+	This variable encodes the prototype of getprotobyname_r.
+
+getprotobynumber_r_proto (d_getprotobynumber_r.U):
+	This variable encodes the prototype of getprotobynumber_r.
+
+getprotoent_r_proto (d_getprotoent_r.U):
+	This variable encodes the prototype of getprotoent_r.
+
+getpwent_r_proto (d_getpwent_r.U):
+	This variable encodes the prototype of getpwent_r.
+
+getpwnam_r_proto (d_getpwnam_r.U):
+	This variable encodes the prototype of getpwnam_r.
+
+getpwuid_r_proto (d_getpwuid_r.U):
+	This variable encodes the prototype of getpwuid_r.
+
+getservbyname_r_proto (d_getservbyname_r.U):
+	This variable encodes the prototype of getservbyname_r.
+
+getservbyport_r_proto (d_getservbyport_r.U):
+	This variable encodes the prototype of getservbyport_r.
+
+getservent_r_proto (d_getservent_r.U):
+	This variable encodes the prototype of getservent_r.
+
+getspnam_r_proto (d_getspnam_r.U):
+	This variable encodes the prototype of getspnam_r.
+
 gidformat (gidf.U):
 	This variable contains the format string used for printing a Gid_t.
 
@@ -2118,6 +2451,9 @@ gmake (Loc.U):
 	full pathname (if any) of the gmake program.  After Configure runs,
 	the value is reset to a plain "gmake" and is not useful.
 
+gmtime_r_proto (d_gmtime_r.U):
+	This variable encodes the prototype of gmtime_r.
+
 grep (Loc.U):
 	This variable is used internally by Configure to determine the
 	full pathname (if any) of the grep program.  After Configure runs,
@@ -2193,6 +2529,10 @@ i_bsdioctl (i_sysioctl.U):
 	indicates to the C program that <sys/bsdioctl.h> exists and should
 	be included.
 
+i_crypt (i_crypt.U):
+	This variable conditionally defines the I_CRYPT symbol, and indicates
+	whether a C program should include <crypt.h>.
+
 i_db (i_db.U):
 	This variable conditionally defines the I_DB symbol, and indicates
 	whether a C program may include Berkeley's DB include file <db.h>.
@@ -2786,6 +3126,9 @@ lns (lns.U):
 	symbolic links (if they are supported).  It can be used
 	in the Makefile. It is either 'ln -s' or 'ln'
 
+localtime_r_proto (d_localtime_r.U):
+	This variable encodes the prototype of localtime_r.
+
 locincpth (ccflags.U):
 	This variable contains a list of additional directories to be
 	searched by the compiler.  The appropriate '-I' directives will
@@ -3267,6 +3610,9 @@ randfunc (randfunc.U):
 	the 'Drand01' macro is defined to generate uniformly distributed
 	random numbers over the range [0., 1.[ (see drand01 and nrand).
 
+random_r_proto (d_random_r.U):
+	This variable encodes the prototype of random_r.
+
 randseedtype (randfunc.U):
 	Indicates the type of the argument of the seedfunc.
 
@@ -3281,6 +3627,12 @@ rd_nodata (nblock_io.U):
 	used, which is a shame because you cannot make the difference between
 	no data and an EOF.. Sigh!
 
+readdir64_r_proto (d_readdir64_r.U):
+	This variable encodes the prototype of readdir64_r.
+
+readdir_r_proto (d_readdir_r.U):
+	This variable encodes the prototype of readdir_r.
+
 revision (patchlevel.U):
 	The value of revision comes from the patchlevel.h file.
 	In a version number such as 5.6.1, this is the "5".
@@ -3347,6 +3699,27 @@ sendmail (Loc.U):
 	This variable is defined but not used by Configure.
 	The value is a plain '' and is not useful.
 
+setgrent_r_proto (d_setgrent_r.U):
+	This variable encodes the prototype of setgrent_r.
+
+sethostent_r_proto (d_sethostent_r.U):
+	This variable encodes the prototype of sethostent_r.
+
+setlocale_r_proto (d_setlocale_r.U):
+	This variable encodes the prototype of setlocale_r.
+
+setnetent_r_proto (d_setnetent_r.U):
+	This variable encodes the prototype of setnetent_r.
+
+setprotoent_r_proto (d_setprotoent_r.U):
+	This variable encodes the prototype of setprotoent_r.
+
+setpwent_r_proto (d_setpwent_r.U):
+	This variable encodes the prototype of setpwent_r.
+
+setservent_r_proto (d_setservent_r.U):
+	This variable encodes the prototype of setservent_r.
+
 sh (sh.U):
 	This variable contains the full pathname of the shell used
 	on this system to execute Bourne shell scripts.  Usually, this will be
@@ -3589,6 +3962,12 @@ sPRIXU64 (quadfio.U):
 	The 'U' in the name is to separate this from sPRIx64 so that even
 	case-blind systems can see the difference.
 
+srand48_r_proto (d_srand48_r.U):
+	This variable encodes the prototype of srand48_r.
+
+srandom_r_proto (d_srandom_r.U):
+	This variable encodes the prototype of srandom_r.
+
 src (src.U):
 	This variable holds the path to the package source. It is up to
 	the Makefile to use this variable and set VPATH accordingly to
@@ -3657,6 +4036,9 @@ stdio_stream_array (stdio_streams.U):
 	This variable tells the name of the array holding the stdio streams.
 	Usual values include _iob, __iob, and __sF.
 
+strerror_r_proto (d_strerror_r.U):
+	This variable encodes the prototype of strerror_r.
+
 strings (i_string.U):
 	This variable holds the full path of the string header that will be
 	used. Typically /usr/include/string.h or /usr/include/strings.h.
@@ -3711,6 +4093,9 @@ timetype (d_time.U):
 	or time_t on BSD sites (in which case <sys/types.h> should be
 	included). Anyway, the type Time_t should be used.
 
+tmpnam_r_proto (d_tmpnam_r.U):
+	This variable encodes the prototype of tmpnam_r.
+
 to (Cross.U):
 	This variable contains the command used by Configure
 	to copy to from the target host.  Useful and available
@@ -3737,6 +4122,9 @@ troff (Loc.U):
 	This variable is defined but not used by Configure.
 	The value is a plain '' and is not useful.
 
+ttyname_r_proto (d_ttyname_r.U):
+	This variable encodes the prototype of ttyname_r.
+
 u16size (perlxv.U):
 	This variable is the size of an U16 in bytes.
 
diff --git a/Porting/config.sh b/Porting/config.sh
index a04fc266db..a504dcefc0 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Wed Mar  6 18:01:27 EET 2002
+# Configuration time: Fri Mar 15 17:39:35 EET 2002
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -41,6 +41,7 @@ archlibexp='/opt/perl/lib/5.7.3/alpha-dec_osf'
 archname64=''
 archname='alpha-dec_osf'
 archobjs=''
+asctime_r_proto='REENTRANT_PROTO_B_SB'
 awk='awk'
 baserev='5.0'
 bash=''
@@ -63,7 +64,7 @@ ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_
 ccversion='V5.6-082'
 cf_by='jhi'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Wed Mar  6 18:01:27 EET 2002'
+cf_time='Fri Mar 15 17:39:35 EET 2002'
 charsize='1'
 chgrp=''
 chmod='chmod'
@@ -83,8 +84,11 @@ cppminus=''
 cpprun='/usr/bin/cpp'
 cppstdin='cppstdin'
 cppsymbols='_AES_SOURCE=1 __alpha=1 __ALPHA=1 _ANSI_C_SOURCE=1 _INTRINSICS=1 __LANGUAGE_C__=1 _LONGLONG=1 __osf__=1 _OSF_SOURCE=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 __STDC__=1 _SYSTYPE_BSD=1 __unix__=1 _XOPEN_SOURCE=1'
+crypt_r_proto='0'
 cryptlib=''
 csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='REENTRANT_PROTO_B_SB'
 d_Gconvert='sprintf((b),"%.*g",(n),(x))'
 d_PRIEUldbl='define'
 d_PRIFUldbl='define'
@@ -104,6 +108,7 @@ d_access='define'
 d_accessx='undef'
 d_alarm='define'
 d_archlib='define'
+d_asctime_r='define'
 d_atolf='undef'
 d_atoll='undef'
 d_attribut='undef'
@@ -125,7 +130,10 @@ d_closedir='define'
 d_cmsghdr_s='define'
 d_const='define'
 d_crypt='define'
+d_crypt_r='undef'
 d_csh='define'
+d_ctermid_r='undef'
+d_ctime_r='define'
 d_cuserid='define'
 d_dbl_dig='define'
 d_dbminitproto='undef'
@@ -136,15 +144,22 @@ d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
 d_dosuid='undef'
+d_drand48_r='define'
 d_drand48proto='define'
 d_dup2='define'
 d_eaccess='undef'
 d_endgrent='define'
+d_endgrent_r='define'
 d_endhent='define'
+d_endhostent_r='define'
 d_endnent='define'
+d_endnetent_r='define'
 d_endpent='define'
+d_endprotoent_r='define'
 d_endpwent='define'
+d_endpwent_r='define'
 d_endsent='define'
+d_endservent_r='define'
 d_eofnblk='define'
 d_eunice='undef'
 d_fchdir='define'
@@ -181,19 +196,29 @@ d_getcwd='define'
 d_getespwnam='undef'
 d_getfsstat='define'
 d_getgrent='define'
+d_getgrent_r='define'
+d_getgrgid_r='define'
+d_getgrnam_r='define'
 d_getgrps='define'
 d_gethbyaddr='define'
 d_gethbyname='define'
 d_gethent='define'
 d_gethname='define'
+d_gethostbyaddr_r='define'
+d_gethostbyname_r='define'
+d_gethostent_r='define'
 d_gethostprotos='define'
 d_getitimer='define'
 d_getlogin='define'
+d_getlogin_r='define'
 d_getmnt='undef'
 d_getmntent='undef'
 d_getnbyaddr='define'
 d_getnbyname='define'
 d_getnent='define'
+d_getnetbyaddr_r='define'
+d_getnetbyname_r='define'
+d_getnetent_r='define'
 d_getnetprotos='define'
 d_getpagsz='define'
 d_getpbyname='define'
@@ -204,15 +229,26 @@ d_getpgrp2='undef'
 d_getpgrp='define'
 d_getppid='define'
 d_getprior='define'
+d_getprotobyname_r='define'
+d_getprotobynumber_r='define'
+d_getprotoent_r='define'
 d_getprotoprotos='define'
 d_getprpwnam='undef'
 d_getpwent='define'
+d_getpwent_r='define'
+d_getpwnam_r='define'
+d_getpwuid_r='define'
 d_getsbyname='define'
 d_getsbyport='define'
 d_getsent='define'
+d_getservbyname_r='define'
+d_getservbyport_r='define'
+d_getservent_r='define'
 d_getservprotos='define'
 d_getspnam='undef'
+d_getspnam_r='undef'
 d_gettimeod='define'
+d_gmtime_r='define'
 d_gnulibc='undef'
 d_grpasswd='define'
 d_hasmntopt='undef'
@@ -229,6 +265,7 @@ d_killpg='define'
 d_lchown='define'
 d_ldbl_dig='define'
 d_link='define'
+d_localtime_r='define'
 d_locconv='define'
 d_lockf='define'
 d_longdbl='define'
@@ -297,7 +334,10 @@ d_pwpasswd='define'
 d_pwquota='define'
 d_qgcvt='undef'
 d_quad='define'
+d_random_r='define'
+d_readdir64_r='undef'
 d_readdir='define'
+d_readdir_r='define'
 d_readlink='define'
 d_readv='define'
 d_recvmsg='define'
@@ -322,19 +362,25 @@ d_sendmsg='define'
 d_setegid='define'
 d_seteuid='define'
 d_setgrent='define'
+d_setgrent_r='define'
 d_setgrps='define'
 d_sethent='define'
+d_sethostent_r='define'
 d_setitimer='define'
 d_setlinebuf='define'
 d_setlocale='define'
+d_setlocale_r='undef'
 d_setnent='define'
+d_setnetent_r='define'
 d_setpent='define'
 d_setpgid='define'
 d_setpgrp2='undef'
 d_setpgrp='define'
 d_setprior='define'
 d_setproctitle='undef'
+d_setprotoent_r='define'
 d_setpwent='define'
+d_setpwent_r='define'
 d_setregid='define'
 d_setresgid='undef'
 d_setresuid='undef'
@@ -342,6 +388,7 @@ d_setreuid='define'
 d_setrgid='define'
 d_setruid='define'
 d_setsent='define'
+d_setservent_r='define'
 d_setsid='define'
 d_setvbuf='define'
 d_sfio='undef'
@@ -361,6 +408,8 @@ d_socklen_t='undef'
 d_sockpair='define'
 d_socks5_init='undef'
 d_sqrtl='define'
+d_srand48_r='define'
+d_srandom_r='define'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='define'
@@ -379,6 +428,7 @@ d_strcoll='define'
 d_strctcpy='define'
 d_strerrm='strerror(e)'
 d_strerror='define'
+d_strerror_r='define'
 d_strftime='define'
 d_strtod='define'
 d_strtol='define'
@@ -405,7 +455,9 @@ d_time='define'
 d_times='define'
 d_tm_tm_gmtoff='define'
 d_tm_tm_zone='define'
+d_tmpnam_r='undef'
 d_truncate='define'
+d_ttyname_r='define'
 d_tzname='define'
 d_u32align='define'
 d_ualarm='define'
@@ -443,12 +495,19 @@ dlext='so'
 dlsrc='dl_dlopen.xs'
 doublesize='8'
 drand01='drand48()'
+drand48_r_proto='REENTRANT_PROTO_I_ST'
 dynamic_ext='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/Scalar PerlIO/Via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/Typemap attrs re Encode/CN Encode/JP Encode/KR Encode/TW'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
 egrep='egrep'
 emacs=''
+endgrent_r_proto='REENTRANT_PROTO_I_H'
+endhostent_r_proto='REENTRANT_PROTO_I_S'
+endnetent_r_proto='REENTRANT_PROTO_I_S'
+endprotoent_r_proto='REENTRANT_PROTO_I_S'
+endpwent_r_proto='REENTRANT_PROTO_I_H'
+endservent_r_proto='REENTRANT_PROTO_I_S'
 eunicefix=':'
 exe_ext=''
 expr='expr'
@@ -468,12 +527,33 @@ full_csh='/usr/bin/csh'
 full_sed='/usr/bin/sed'
 gccosandvers=''
 gccversion=''
+getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
+getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
+getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
+gethostbyaddr_r_proto='REENTRANT_PROTO_I_CWISBWRE'
+gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
+gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
+getlogin_r_proto='REENTRANT_PROTO_I_BW'
+getnetbyaddr_r_proto='REENTRANT_PROTO_I_UISBWRE'
+getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
+getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
+getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
+getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
+getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
+getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
+getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
+getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
+getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
+getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
+getservent_r_proto='REENTRANT_PROTO_I_SBWR'
+getspnam_r_proto='0'
 gidformat='"u"'
 gidsign='1'
 gidsize='4'
 gidtype='gid_t'
 glibpth='/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib'
 gmake='gmake'
+gmtime_r_proto='REENTRANT_PROTO_S_TS'
 grep='grep'
 groupcat='cat /etc/group'
 groupstype='gid_t'
@@ -492,6 +572,7 @@ i8size='1'
 i8type='char'
 i_arpainet='define'
 i_bsdioctl=''
+i_crypt='define'
 i_db='define'
 i_dbm='define'
 i_dirent='define'
@@ -621,6 +702,7 @@ lint=''
 lkflags=''
 ln='ln'
 lns='/usr/bin/ln -s'
+localtime_r_proto='REENTRANT_PROTO_S_TS'
 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='8'
@@ -689,7 +771,7 @@ patchlevel='7'
 path_sep=':'
 perl5='perl'
 perl=''
-perl_patchlevel='15046'
+perl_patchlevel='15172'
 perladmin='yourname@yourhost.yourplace.com'
 perllibs='-lm -lutil'
 perlpath='/opt/perl/bin/perl5.7.3'
@@ -711,9 +793,12 @@ quadkind='2'
 quadtype='long'
 randbits='48'
 randfunc='drand48'
+random_r_proto='REENTRANT_PROTO_I_TS'
 randseedtype='long'
 ranlib=':'
 rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='REENTRANT_PROTO_I_TSR'
 revision='5'
 rm='rm'
 rmail=''
@@ -740,6 +825,13 @@ seedfunc='srand48'
 selectminbits='32'
 selecttype='fd_set *'
 sendmail=''
+setgrent_r_proto='REENTRANT_PROTO_I_H'
+sethostent_r_proto='REENTRANT_PROTO_I_ID'
+setlocale_r_proto='0'
+setnetent_r_proto='REENTRANT_PROTO_I_ID'
+setprotoent_r_proto='REENTRANT_PROTO_I_ID'
+setpwent_r_proto='REENTRANT_PROTO_I_H'
+setservent_r_proto='REENTRANT_PROTO_I_ID'
 sh='/bin/sh'
 shar=''
 sharpbang='#!'
@@ -774,6 +866,8 @@ socksizetype='int'
 sort='sort'
 spackage='Perl5'
 spitshell='cat'
+srand48_r_proto='REENTRANT_PROTO_I_LS'
+srandom_r_proto='REENTRANT_PROTO_I_TS'
 src='.'
 ssizetype='ssize_t'
 startperl='#!/opt/perl/bin/perl5.7.3'
@@ -786,6 +880,7 @@ stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
 stdio_stream_array='_iob'
+strerror_r_proto='REENTRANT_PROTO_I_IBW'
 strings='/usr/include/string.h'
 submit=''
 subversion='3'
@@ -798,11 +893,13 @@ tee=''
 test='test'
 timeincl='/usr/include/sys/time.h '
 timetype='time_t'
+tmpnam_r_proto='0'
 to=':'
 touch='touch'
 tr='tr'
 trnl='\n'
 troff=''
+ttyname_r_proto='REENTRANT_PROTO_I_IBW'
 u16size='2'
 u16type='unsigned short'
 u32size='4'
@@ -858,7 +955,7 @@ vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
 version='5.7.3'
-version_patchlevel_string='version 7 subversion 3 patch 15046'
+version_patchlevel_string='version 7 subversion 3 patch 15172'
 versiononly='define'
 vi=''
 voidflags='15'
@@ -888,7 +985,7 @@ PERL_SUBVERSION=3
 PERL_API_REVISION=5
 PERL_API_VERSION=5
 PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=15046
+PERL_PATCHLEVEL=15172
 PERL_CONFIG_SH=true
 # Variables propagated from previous config.sh file.
 pp_sys_cflags='ccflags="$ccflags -DNO_EFF_ONLY_OK"'
diff --git a/Porting/config_H b/Porting/config_H
index 4ff3c4837b..21639fddbf 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Wed Mar  6 18:01:27 EET 2002
+ * Configuration time: Fri Mar 15 17:39:35 EET 2002
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -1136,6 +1136,16 @@
  */
 #define HAS_ACCESS		/**/
 
+/* HAS_ASCTIME_R:
+ *	This symbol, if defined, indicates that the asctime_r routine
+ *	is available to asctime re-entrantly.
+ */
+/* ASCTIME_R_PROTO:
+ *	This symbol encodes the prototype of asctime_r.
+ */
+#define HAS_ASCTIME_R	   /**/
+#define ASCTIME_R_PROTO REENTRANT_PROTO_B_SB	   /**/
+
 /* CASTI32:
  *	This symbol is defined if the C compiler can cast negative
  *	or large floating point numbers to 32-bit ints.
@@ -1187,6 +1197,16 @@
  */
 #define HAS_STRUCT_CMSGHDR	/**/
 
+/* HAS_CRYPT_R:
+ *	This symbol, if defined, indicates that the crypt_r routine
+ *	is available to crypt re-entrantly.
+ */
+/* CRYPT_R_PROTO:
+ *	This symbol encodes the prototype of crypt_r.
+ */
+/*#define HAS_CRYPT_R	   / **/
+#define CRYPT_R_PROTO 0	   /**/
+
 /* HAS_CSH:
  *	This symbol, if defined, indicates that the C-shell exists.
  */
@@ -1198,6 +1218,16 @@
 #define CSH "/usr/bin/csh"	/**/
 #endif
 
+/* HAS_CTIME_R:
+ *	This symbol, if defined, indicates that the ctime_r routine
+ *	is available to ctime re-entrantly.
+ */
+/* CTIME_R_PROTO:
+ *	This symbol encodes the prototype of ctime_r.
+ */
+#define HAS_CTIME_R	   /**/
+#define CTIME_R_PROTO REENTRANT_PROTO_B_SB	   /**/
+
 /* DLSYM_NEEDS_UNDERSCORE:
  *	This symbol, if defined, indicates that we need to prepend an
  *	underscore to the symbol name before calling dlsym().  This only
@@ -1206,6 +1236,16 @@
  */
 /*#define 	DLSYM_NEEDS_UNDERSCORE 	/ **/
 
+/* HAS_DRAND48_R:
+ *	This symbol, if defined, indicates that the drand48_r routine
+ *	is available to drand48 re-entrantly.
+ */
+/* DRAND48_R_PROTO:
+ *	This symbol encodes the prototype of drand48_r.
+ */
+#define HAS_DRAND48_R	   /**/
+#define DRAND48_R_PROTO REENTRANT_PROTO_I_ST	   /**/
+
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
@@ -1220,6 +1260,16 @@
  */
 #define HAS_ENDGRENT		/**/
 
+/* HAS_ENDGRENT_R:
+ *	This symbol, if defined, indicates that the endgrent_r routine
+ *	is available to endgrent re-entrantly.
+ */
+/* ENDGRENT_R_PROTO:
+ *	This symbol encodes the prototype of endgrent_r.
+ */
+#define HAS_ENDGRENT_R	   /**/
+#define ENDGRENT_R_PROTO REENTRANT_PROTO_I_H	   /**/
+
 /* HAS_ENDHOSTENT:
  *	This symbol, if defined, indicates that the endhostent() routine is
  *	available to close whatever was being used for host queries.
@@ -1244,6 +1294,16 @@
  */
 #define HAS_ENDPWENT		/**/
 
+/* HAS_ENDPWENT_R:
+ *	This symbol, if defined, indicates that the endpwent_r routine
+ *	is available to endpwent re-entrantly.
+ */
+/* ENDPWENT_R_PROTO:
+ *	This symbol encodes the prototype of endpwent_r.
+ */
+#define HAS_ENDPWENT_R	   /**/
+#define ENDPWENT_R_PROTO REENTRANT_PROTO_I_H	   /**/
+
 /* HAS_ENDSERVENT:
  *	This symbol, if defined, indicates that the endservent() routine is
  *	available to close whatever was being used for service queries.
@@ -1422,6 +1482,36 @@
  */
 #define HAS_GETGRENT		/**/
 
+/* HAS_GETGRENT_R:
+ *	This symbol, if defined, indicates that the getgrent_r routine
+ *	is available to getgrent re-entrantly.
+ */
+/* GETGRENT_R_PROTO:
+ *	This symbol encodes the prototype of getgrent_r.
+ */
+#define HAS_GETGRENT_R	   /**/
+#define GETGRENT_R_PROTO REENTRANT_PROTO_I_SBWR	   /**/
+
+/* HAS_GETGRGID_R:
+ *	This symbol, if defined, indicates that the getgrgid_r routine
+ *	is available to getgrgid re-entrantly.
+ */
+/* GETGRGID_R_PROTO:
+ *	This symbol encodes the prototype of getgrgid_r.
+ */
+#define HAS_GETGRGID_R	   /**/
+#define GETGRGID_R_PROTO REENTRANT_PROTO_I_TSBWR	   /**/
+
+/* HAS_GETGRNAM_R:
+ *	This symbol, if defined, indicates that the getgrnam_r routine
+ *	is available to getgrnam re-entrantly.
+ */
+/* GETGRNAM_R_PROTO:
+ *	This symbol encodes the prototype of getgrnam_r.
+ */
+#define HAS_GETGRNAM_R	   /**/
+#define GETGRNAM_R_PROTO REENTRANT_PROTO_I_CSBWR	   /**/
+
 /* HAS_GETHOSTBYADDR:
  *	This symbol, if defined, indicates that the gethostbyaddr() routine is
  *	available to look up hosts by their IP addresses.
@@ -1483,6 +1573,16 @@
  */
 #define HAS_GETITIMER		/**/
 
+/* HAS_GETLOGIN_R:
+ *	This symbol, if defined, indicates that the getlogin_r routine
+ *	is available to getlogin re-entrantly.
+ */
+/* GETLOGIN_R_PROTO:
+ *	This symbol encodes the prototype of getlogin_r.
+ */
+#define HAS_GETLOGIN_R	   /**/
+#define GETLOGIN_R_PROTO REENTRANT_PROTO_I_BW	   /**/
+
 /* HAS_GETMNT:
  *	This symbol, if defined, indicates that the getmnt routine is
  *	available to get filesystem mount info by filename.
@@ -1577,6 +1677,36 @@
  */
 #define HAS_GETPWENT		/**/
 
+/* HAS_GETPWENT_R:
+ *	This symbol, if defined, indicates that the getpwent_r routine
+ *	is available to getpwent re-entrantly.
+ */
+/* GETPWENT_R_PROTO:
+ *	This symbol encodes the prototype of getpwent_r.
+ */
+#define HAS_GETPWENT_R	   /**/
+#define GETPWENT_R_PROTO REENTRANT_PROTO_I_SBWR	   /**/
+
+/* HAS_GETPWNAM_R:
+ *	This symbol, if defined, indicates that the getpwnam_r routine
+ *	is available to getpwnam re-entrantly.
+ */
+/* GETPWNAM_R_PROTO:
+ *	This symbol encodes the prototype of getpwnam_r.
+ */
+#define HAS_GETPWNAM_R	   /**/
+#define GETPWNAM_R_PROTO REENTRANT_PROTO_I_CSBWR	   /**/
+
+/* HAS_GETPWUID_R:
+ *	This symbol, if defined, indicates that the getpwuid_r routine
+ *	is available to getpwuid re-entrantly.
+ */
+/* GETPWUID_R_PROTO:
+ *	This symbol encodes the prototype of getpwuid_r.
+ */
+#define HAS_GETPWUID_R	   /**/
+#define GETPWUID_R_PROTO REENTRANT_PROTO_I_TSBWR	   /**/
+
 /* HAS_GETSERVENT:
  *	This symbol, if defined, indicates that the getservent() routine is
  *	available to look up network services in some data base or another.
@@ -1597,6 +1727,16 @@
  */
 /*#define HAS_GETSPNAM		/ **/
 
+/* HAS_GETSPNAM_R:
+ *	This symbol, if defined, indicates that the getspnam_r routine
+ *	is available to getspnam re-entrantly.
+ */
+/* GETSPNAM_R_PROTO:
+ *	This symbol encodes the prototype of getspnam_r.
+ */
+/*#define HAS_GETSPNAM_R	   / **/
+#define GETSPNAM_R_PROTO 0	   /**/
+
 /* HAS_GETSERVBYNAME:
  *	This symbol, if defined, indicates that the getservbyname()
  *	routine is available to look up services by their name.
@@ -1608,6 +1748,16 @@
 #define HAS_GETSERVBYNAME		/**/
 #define HAS_GETSERVBYPORT		/**/
 
+/* HAS_GMTIME_R:
+ *	This symbol, if defined, indicates that the gmtime_r routine
+ *	is available to gmtime re-entrantly.
+ */
+/* GMTIME_R_PROTO:
+ *	This symbol encodes the prototype of gmtime_r.
+ */
+#define HAS_GMTIME_R	   /**/
+#define GMTIME_R_PROTO REENTRANT_PROTO_S_TS	   /**/
+
 /* HAS_GNULIBC:
  *	This symbol, if defined, indicates to the C program that 
  *	the GNU C library is being used.
@@ -1699,6 +1849,16 @@
  */
 #define HAS_LDBL_DIG 	/* */
 
+/* HAS_LOCALTIME_R:
+ *	This symbol, if defined, indicates that the localtime_r routine
+ *	is available to localtime re-entrantly.
+ */
+/* LOCALTIME_R_PROTO:
+ *	This symbol encodes the prototype of localtime_r.
+ */
+#define HAS_LOCALTIME_R	   /**/
+#define LOCALTIME_R_PROTO REENTRANT_PROTO_S_TS	   /**/
+
 /* HAS_LONG_DOUBLE:
  *	This symbol will be defined if the C compiler supports long
  *	doubles.
@@ -1851,6 +2011,26 @@
 #define SCHED_YIELD	sched_yield()	/**/
 #define HAS_SCHED_YIELD	/**/
 
+/* HAS_RANDOM_R:
+ *	This symbol, if defined, indicates that the random_r routine
+ *	is available to random re-entrantly.
+ */
+/* RANDOM_R_PROTO:
+ *	This symbol encodes the prototype of random_r.
+ */
+#define HAS_RANDOM_R	   /**/
+#define RANDOM_R_PROTO REENTRANT_PROTO_I_TS	   /**/
+
+/* HAS_READDIR_R:
+ *	This symbol, if defined, indicates that the readdir_r routine
+ *	is available to readdir re-entrantly.
+ */
+/* READDIR_R_PROTO:
+ *	This symbol encodes the prototype of readdir_r.
+ */
+#define HAS_READDIR_R	   /**/
+#define READDIR_R_PROTO REENTRANT_PROTO_I_TSR	   /**/
+
 /* HAS_READV:
  *	This symbol, if defined, indicates that the readv routine is
  *	available to do gather reads.  You will also need <sys/uio.h>
@@ -1914,6 +2094,16 @@
  */
 #define HAS_SETGRENT		/**/
 
+/* HAS_SETGRENT_R:
+ *	This symbol, if defined, indicates that the setgrent_r routine
+ *	is available to setgrent re-entrantly.
+ */
+/* SETGRENT_R_PROTO:
+ *	This symbol encodes the prototype of setgrent_r.
+ */
+#define HAS_SETGRENT_R	   /**/
+#define SETGRENT_R_PROTO REENTRANT_PROTO_I_H	   /**/
+
 /* HAS_SETGROUPS:
  *	This symbol, if defined, indicates that the setgroups() routine is
  *	available to set the list of process groups.  If unavailable, multiple
@@ -1969,6 +2159,16 @@
  */
 #define HAS_SETPWENT		/**/
 
+/* HAS_SETPWENT_R:
+ *	This symbol, if defined, indicates that the setpwent_r routine
+ *	is available to setpwent re-entrantly.
+ */
+/* SETPWENT_R_PROTO:
+ *	This symbol encodes the prototype of setpwent_r.
+ */
+#define HAS_SETPWENT_R	   /**/
+#define SETPWENT_R_PROTO REENTRANT_PROTO_I_H	   /**/
+
 /* HAS_SETSERVENT:
  *	This symbol, if defined, indicates that the setservent() routine is
  *	available.
@@ -2090,6 +2290,26 @@
  */
 #define HAS_SQRTL		/**/
 
+/* HAS_SRAND48_R:
+ *	This symbol, if defined, indicates that the srand48_r routine
+ *	is available to srand48 re-entrantly.
+ */
+/* SRAND48_R_PROTO:
+ *	This symbol encodes the prototype of srand48_r.
+ */
+#define HAS_SRAND48_R	   /**/
+#define SRAND48_R_PROTO REENTRANT_PROTO_I_LS	   /**/
+
+/* HAS_SRANDOM_R:
+ *	This symbol, if defined, indicates that the srandom_r routine
+ *	is available to srandom re-entrantly.
+ */
+/* SRANDOM_R_PROTO:
+ *	This symbol encodes the prototype of srandom_r.
+ */
+#define HAS_SRANDOM_R	   /**/
+#define SRANDOM_R_PROTO REENTRANT_PROTO_I_TS	   /**/
+
 /* USE_STAT_BLOCKS:
  *	This symbol is defined if this system has a stat structure declaring
  *	st_blksize and st_blocks.
@@ -2210,6 +2430,16 @@
 #define HAS_SYS_ERRLIST	/**/
 #define Strerror(e) strerror(e)
 
+/* HAS_STRERROR_R:
+ *	This symbol, if defined, indicates that the strerror_r routine
+ *	is available to strerror re-entrantly.
+ */
+/* STRERROR_R_PROTO:
+ *	This symbol encodes the prototype of strerror_r.
+ */
+#define HAS_STRERROR_R	   /**/
+#define STRERROR_R_PROTO REENTRANT_PROTO_I_IBW	   /**/
+
 /* HAS_STRTOLD:
  *	This symbol, if defined, indicates that the strtold routine is
  *	available to convert strings to long doubles.
@@ -2268,6 +2498,16 @@
  */
 #define HAS_TIMES		/**/
 
+/* HAS_TMPNAM_R:
+ *	This symbol, if defined, indicates that the tmpnam_r routine
+ *	is available to tmpnam re-entrantly.
+ */
+/* TMPNAM_R_PROTO:
+ *	This symbol encodes the prototype of tmpnam_r.
+ */
+/*#define HAS_TMPNAM_R	   / **/
+#define TMPNAM_R_PROTO 0	   /**/
+
 /* HAS_UALARM:
  *	This symbol, if defined, indicates that the ualarm routine is
  *	available to do alarms with microsecond granularity.
@@ -3588,6 +3828,12 @@
  */
 /*#define	HAS_USLEEP_PROTO	/ **/
 
+/* I_CRYPT:
+ *	This symbol, if defined, indicates that <crypt.h> exists and
+ *	should be included.
+ */
+#define	I_CRYPT		/**/
+
 /* I_FP:
  *	This symbol, if defined, indicates that <fp.h> exists and
  *	should be included.
@@ -3600,10 +3846,250 @@
  */
 #define	I_LANGINFO		/**/
 
+/* HAS_CTERMID_R:
+ *	This symbol, if defined, indicates that the ctermid_r routine
+ *	is available to ctermid re-entrantly.
+ */
+/* CTERMID_R_PROTO:
+ *	This symbol encodes the prototype of ctermid_r.
+ */
+/*#define HAS_CTERMID_R	   / **/
+#define CTERMID_R_PROTO 0	   /**/
+
+/* HAS_ENDHOSTENT_R:
+ *	This symbol, if defined, indicates that the endhostent_r routine
+ *	is available to endhostent re-entrantly.
+ */
+/* ENDHOSTENT_R_PROTO:
+ *	This symbol encodes the prototype of endhostent_r.
+ */
+#define HAS_ENDHOSTENT_R	   /**/
+#define ENDHOSTENT_R_PROTO REENTRANT_PROTO_I_S	   /**/
+
+/* HAS_ENDNETENT_R:
+ *	This symbol, if defined, indicates that the endnetent_r routine
+ *	is available to endnetent re-entrantly.
+ */
+/* ENDNETENT_R_PROTO:
+ *	This symbol encodes the prototype of endnetent_r.
+ */
+#define HAS_ENDNETENT_R	   /**/
+#define ENDNETENT_R_PROTO REENTRANT_PROTO_I_S	   /**/
+
+/* HAS_ENDPROTOENT_R:
+ *	This symbol, if defined, indicates that the endprotoent_r routine
+ *	is available to endprotoent re-entrantly.
+ */
+/* ENDPROTOENT_R_PROTO:
+ *	This symbol encodes the prototype of endprotoent_r.
+ */
+#define HAS_ENDPROTOENT_R	   /**/
+#define ENDPROTOENT_R_PROTO REENTRANT_PROTO_I_S	   /**/
+
+/* HAS_ENDSERVENT_R:
+ *	This symbol, if defined, indicates that the endservent_r routine
+ *	is available to endservent re-entrantly.
+ */
+/* ENDSERVENT_R_PROTO:
+ *	This symbol encodes the prototype of endservent_r.
+ */
+#define HAS_ENDSERVENT_R	   /**/
+#define ENDSERVENT_R_PROTO REENTRANT_PROTO_I_S	   /**/
+
+/* HAS_GETHOSTBYADDR_R:
+ *	This symbol, if defined, indicates that the gethostbyaddr_r routine
+ *	is available to gethostbyaddr re-entrantly.
+ */
+/* GETHOSTBYADDR_R_PROTO:
+ *	This symbol encodes the prototype of gethostbyaddr_r.
+ */
+#define HAS_GETHOSTBYADDR_R	   /**/
+#define GETHOSTBYADDR_R_PROTO REENTRANT_PROTO_I_CWISBWRE	   /**/
+
+/* HAS_GETHOSTBYNAME_R:
+ *	This symbol, if defined, indicates that the gethostbyname_r routine
+ *	is available to gethostbyname re-entrantly.
+ */
+/* GETHOSTBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of gethostbyname_r.
+ */
+#define HAS_GETHOSTBYNAME_R	   /**/
+#define GETHOSTBYNAME_R_PROTO REENTRANT_PROTO_I_CSBWRE	   /**/
+
+/* HAS_GETHOSTENT_R:
+ *	This symbol, if defined, indicates that the gethostent_r routine
+ *	is available to gethostent re-entrantly.
+ */
+/* GETHOSTENT_R_PROTO:
+ *	This symbol encodes the prototype of gethostent_r.
+ */
+#define HAS_GETHOSTENT_R	   /**/
+#define GETHOSTENT_R_PROTO REENTRANT_PROTO_I_SBWRE	   /**/
+
+/* HAS_GETNETBYADDR_R:
+ *	This symbol, if defined, indicates that the getnetbyaddr_r routine
+ *	is available to getnetbyaddr re-entrantly.
+ */
+/* GETNETBYADDR_R_PROTO:
+ *	This symbol encodes the prototype of getnetbyaddr_r.
+ */
+#define HAS_GETNETBYADDR_R	   /**/
+#define GETNETBYADDR_R_PROTO REENTRANT_PROTO_I_UISBWRE	   /**/
+
+/* HAS_GETNETBYNAME_R:
+ *	This symbol, if defined, indicates that the getnetbyname_r routine
+ *	is available to getnetbyname re-entrantly.
+ */
+/* GETNETBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of getnetbyname_r.
+ */
+#define HAS_GETNETBYNAME_R	   /**/
+#define GETNETBYNAME_R_PROTO REENTRANT_PROTO_I_CSBWRE	   /**/
+
+/* HAS_GETNETENT_R:
+ *	This symbol, if defined, indicates that the getnetent_r routine
+ *	is available to getnetent re-entrantly.
+ */
+/* GETNETENT_R_PROTO:
+ *	This symbol encodes the prototype of getnetent_r.
+ */
+#define HAS_GETNETENT_R	   /**/
+#define GETNETENT_R_PROTO REENTRANT_PROTO_I_SBWRE	   /**/
+
+/* HAS_GETPROTOBYNAME_R:
+ *	This symbol, if defined, indicates that the getprotobyname_r routine
+ *	is available to getprotobyname re-entrantly.
+ */
+/* GETPROTOBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of getprotobyname_r.
+ */
+#define HAS_GETPROTOBYNAME_R	   /**/
+#define GETPROTOBYNAME_R_PROTO REENTRANT_PROTO_I_CSBWR	   /**/
+
+/* HAS_GETPROTOBYNUMBER_R:
+ *	This symbol, if defined, indicates that the getprotobynumber_r routine
+ *	is available to getprotobynumber re-entrantly.
+ */
+/* GETPROTOBYNUMBER_R_PROTO:
+ *	This symbol encodes the prototype of getprotobynumber_r.
+ */
+#define HAS_GETPROTOBYNUMBER_R	   /**/
+#define GETPROTOBYNUMBER_R_PROTO REENTRANT_PROTO_I_ISBWR	   /**/
+
+/* HAS_GETPROTOENT_R:
+ *	This symbol, if defined, indicates that the getprotoent_r routine
+ *	is available to getprotoent re-entrantly.
+ */
+/* GETPROTOENT_R_PROTO:
+ *	This symbol encodes the prototype of getprotoent_r.
+ */
+#define HAS_GETPROTOENT_R	   /**/
+#define GETPROTOENT_R_PROTO REENTRANT_PROTO_I_SBWR	   /**/
+
+/* HAS_GETSERVBYNAME_R:
+ *	This symbol, if defined, indicates that the getservbyname_r routine
+ *	is available to getservbyname re-entrantly.
+ */
+/* GETSERVBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of getservbyname_r.
+ */
+#define HAS_GETSERVBYNAME_R	   /**/
+#define GETSERVBYNAME_R_PROTO REENTRANT_PROTO_I_CCSBWR	   /**/
+
+/* HAS_GETSERVBYPORT_R:
+ *	This symbol, if defined, indicates that the getservbyport_r routine
+ *	is available to getservbyport re-entrantly.
+ */
+/* GETSERVBYPORT_R_PROTO:
+ *	This symbol encodes the prototype of getservbyport_r.
+ */
+#define HAS_GETSERVBYPORT_R	   /**/
+#define GETSERVBYPORT_R_PROTO REENTRANT_PROTO_I_ICSBWR	   /**/
+
+/* HAS_GETSERVENT_R:
+ *	This symbol, if defined, indicates that the getservent_r routine
+ *	is available to getservent re-entrantly.
+ */
+/* GETSERVENT_R_PROTO:
+ *	This symbol encodes the prototype of getservent_r.
+ */
+#define HAS_GETSERVENT_R	   /**/
+#define GETSERVENT_R_PROTO REENTRANT_PROTO_I_SBWR	   /**/
+
 /* HAS_PTHREAD_ATFORK:
  *	This symbol, if defined, indicates that the pthread_atfork routine
  *	is available setup fork handlers.
  */
 #define HAS_PTHREAD_ATFORK		/**/
 
+/* HAS_READDIR64_R:
+ *	This symbol, if defined, indicates that the readdir64_r routine
+ *	is available to readdir64 re-entrantly.
+ */
+/* READDIR64_R_PROTO:
+ *	This symbol encodes the prototype of readdir64_r.
+ */
+/*#define HAS_READDIR64_R	   / **/
+#define READDIR64_R_PROTO 0	   /**/
+
+/* HAS_SETHOSTENT_R:
+ *	This symbol, if defined, indicates that the sethostent_r routine
+ *	is available to sethostent re-entrantly.
+ */
+/* SETHOSTENT_R_PROTO:
+ *	This symbol encodes the prototype of sethostent_r.
+ */
+#define HAS_SETHOSTENT_R	   /**/
+#define SETHOSTENT_R_PROTO REENTRANT_PROTO_I_ID	   /**/
+
+/* HAS_SETLOCALE_R:
+ *	This symbol, if defined, indicates that the setlocale_r routine
+ *	is available to setlocale re-entrantly.
+ */
+/* SETLOCALE_R_PROTO:
+ *	This symbol encodes the prototype of setlocale_r.
+ */
+/*#define HAS_SETLOCALE_R	   / **/
+#define SETLOCALE_R_PROTO 0	   /**/
+
+/* HAS_SETNETENT_R:
+ *	This symbol, if defined, indicates that the setnetent_r routine
+ *	is available to setnetent re-entrantly.
+ */
+/* SETNETENT_R_PROTO:
+ *	This symbol encodes the prototype of setnetent_r.
+ */
+#define HAS_SETNETENT_R	   /**/
+#define SETNETENT_R_PROTO REENTRANT_PROTO_I_ID	   /**/
+
+/* HAS_SETPROTOENT_R:
+ *	This symbol, if defined, indicates that the setprotoent_r routine
+ *	is available to setprotoent re-entrantly.
+ */
+/* SETPROTOENT_R_PROTO:
+ *	This symbol encodes the prototype of setprotoent_r.
+ */
+#define HAS_SETPROTOENT_R	   /**/
+#define SETPROTOENT_R_PROTO REENTRANT_PROTO_I_ID	   /**/
+
+/* HAS_SETSERVENT_R:
+ *	This symbol, if defined, indicates that the setservent_r routine
+ *	is available to setservent re-entrantly.
+ */
+/* SETSERVENT_R_PROTO:
+ *	This symbol encodes the prototype of setservent_r.
+ */
+#define HAS_SETSERVENT_R	   /**/
+#define SETSERVENT_R_PROTO REENTRANT_PROTO_I_ID	   /**/
+
+/* HAS_TTYNAME_R:
+ *	This symbol, if defined, indicates that the ttyname_r routine
+ *	is available to ttyname re-entrantly.
+ */
+/* TTYNAME_R_PROTO:
+ *	This symbol encodes the prototype of ttyname_r.
+ */
+#define HAS_TTYNAME_R	   /**/
+#define TTYNAME_R_PROTO REENTRANT_PROTO_I_IBW	   /**/
+
 #endif
diff --git a/Porting/findrfuncs b/Porting/findrfuncs
index bef27594a4..029bdd0980 100644
--- a/Porting/findrfuncs
+++ b/Porting/findrfuncs
@@ -65,7 +65,11 @@ delete $rfuncs{setlocale_r} if $^O eq 'linux';
 my $netdb_r_obsolete;
 if ($^O eq 'hpux') {
     delete $rfuncs{crypt_r};
+    delete $rfuncs{drand48_r};
+    delete $rfuncs{getgrent_r};
+    delete $rfuncs{getpwent_r};
     delete $rfuncs{setlocale_r};
+    delete $rfuncs{srand48_r};
     delete $rfuncs{strerror_r};
     $netdb_r_obsolete = 1;
 } elsif ($^O eq 'dec_osf') {
@@ -84,8 +88,8 @@ if ($netdb_r_obsolete) {
 		      getnetbyaddr_r
 		      getnetbyname_r
 		      getnetent_r
-		      getprotobynumber_r
 		      getprotobyname_r
+		      getprotobynumber_r
 		      getprotoent_r
 		      getservbyname_r
 		      getservbyport_r