Document better what the foo_r_proto are supposed to be.

p4raw-id: //depot/perl@16711

6 files changed, 449 insertions, 9 deletions

diff --git a/Configure b/Configure
index fa59b5f42e..f71d7e39e2 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Thu May 16 17:03:39 EET DST 2002 [metaconfig 3.0 PL70]
+# Generated on Mon May 20 18:21:27 EET DST 2002 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
diff --git a/Porting/Glossary b/Porting/Glossary
index 1414e21381..f2d71b9252 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -122,6 +122,9 @@ archobjs (Unix.U):
 
 asctime_r_proto (d_asctime_r.U):
 	This variable encodes the prototype of asctime_r.
+	It is zero if d_asctime_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_asctime_r
+	is defined.
 
 awk (Loc.U):
 	This variable is used internally by Configure to determine the
@@ -332,6 +335,9 @@ cppsymbols (Cppsym.U):
 
 crypt_r_proto (d_crypt_r.U):
 	This variable encodes the prototype of crypt_r.
+	It is zero if d_crypt_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_crypt_r
+	is defined.
 
 cryptlib (d_crypt.U):
 	This variable holds -lcrypt or the path to a libcrypt.a archive if
@@ -345,9 +351,15 @@ csh (Loc.U):
 
 ctermid_r_proto (d_ctermid_r.U):
 	This variable encodes the prototype of ctermid_r.
+	It is zero if d_ctermid_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctermid_r
+	is defined.
 
 ctime_r_proto (d_ctime_r.U):
 	This variable encodes the prototype of ctime_r.
+	It is zero if d_ctime_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctime_r
+	is defined.
 
 d__fwalk (d__fwalk.U):
 	This variable conditionally defines HAS__FWALK if _fwalk() is
@@ -2212,6 +2224,9 @@ drand01 (randfunc.U):
 
 drand48_r_proto (d_drand48_r.U):
 	This variable encodes the prototype of drand48_r.
+	It is zero if d_drand48_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_drand48_r
+	is defined.
 
 dynamic_ext (Extensions.U):
 	This variable holds a list of XS extension files we want to
@@ -2244,21 +2259,39 @@ emacs (Loc.U):
 
 endgrent_r_proto (d_endgrent_r.U):
 	This variable encodes the prototype of endgrent_r.
+	It is zero if d_endgrent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endgrent_r
+	is defined.
 
 endhostent_r_proto (d_endhostent_r.U):
 	This variable encodes the prototype of endhostent_r.
+	It is zero if d_endhostent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endhostent_r
+	is defined.
 
 endnetent_r_proto (d_endnetent_r.U):
 	This variable encodes the prototype of endnetent_r.
+	It is zero if d_endnetent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endnetent_r
+	is defined.
 
 endprotoent_r_proto (d_endprotoent_r.U):
 	This variable encodes the prototype of endprotoent_r.
+	It is zero if d_endprotoent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endprotoent_r
+	is defined.
 
 endpwent_r_proto (d_endpwent_r.U):
 	This variable encodes the prototype of endpwent_r.
+	It is zero if d_endpwent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endpwent_r
+	is defined.
 
 endservent_r_proto (d_endservent_r.U):
 	This variable encodes the prototype of endservent_r.
+	It is zero if d_endservent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endservent_r
+	is defined.
 
 eunicefix (Init.U):
 	When running under Eunice this variable contains a command which will
@@ -2355,63 +2388,123 @@ gccversion (gccvers.U):
 
 getgrent_r_proto (d_getgrent_r.U):
 	This variable encodes the prototype of getgrent_r.
+	It is zero if d_getgrent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrent_r
+	is defined.
 
 getgrgid_r_proto (d_getgrgid_r.U):
 	This variable encodes the prototype of getgrgid_r.
+	It is zero if d_getgrgid_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrgid_r
+	is defined.
 
 getgrnam_r_proto (d_getgrnam_r.U):
 	This variable encodes the prototype of getgrnam_r.
+	It is zero if d_getgrnam_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrnam_r
+	is defined.
 
 gethostbyaddr_r_proto (d_gethostbyaddr_r.U):
 	This variable encodes the prototype of gethostbyaddr_r.
+	It is zero if d_gethostbyaddr_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyaddr_r
+	is defined.
 
 gethostbyname_r_proto (d_gethostbyname_r.U):
 	This variable encodes the prototype of gethostbyname_r.
+	It is zero if d_gethostbyname_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyname_r
+	is defined.
 
 gethostent_r_proto (d_gethostent_r.U):
 	This variable encodes the prototype of gethostent_r.
+	It is zero if d_gethostent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostent_r
+	is defined.
 
 getlogin_r_proto (d_getlogin_r.U):
 	This variable encodes the prototype of getlogin_r.
+	It is zero if d_getlogin_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getlogin_r
+	is defined.
 
 getnetbyaddr_r_proto (d_getnetbyaddr_r.U):
 	This variable encodes the prototype of getnetbyaddr_r.
+	It is zero if d_getnetbyaddr_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyaddr_r
+	is defined.
 
 getnetbyname_r_proto (d_getnetbyname_r.U):
 	This variable encodes the prototype of getnetbyname_r.
+	It is zero if d_getnetbyname_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyname_r
+	is defined.
 
 getnetent_r_proto (d_getnetent_r.U):
 	This variable encodes the prototype of getnetent_r.
+	It is zero if d_getnetent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetent_r
+	is defined.
 
 getprotobyname_r_proto (d_getprotobyname_r.U):
 	This variable encodes the prototype of getprotobyname_r.
+	It is zero if d_getprotobyname_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobyname_r
+	is defined.
 
 getprotobynumber_r_proto (d_getprotobynumber_r.U):
 	This variable encodes the prototype of getprotobynumber_r.
+	It is zero if d_getprotobynumber_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobynumber_r
+	is defined.
 
 getprotoent_r_proto (d_getprotoent_r.U):
 	This variable encodes the prototype of getprotoent_r.
+	It is zero if d_getprotoent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotoent_r
+	is defined.
 
 getpwent_r_proto (d_getpwent_r.U):
 	This variable encodes the prototype of getpwent_r.
+	It is zero if d_getpwent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwent_r
+	is defined.
 
 getpwnam_r_proto (d_getpwnam_r.U):
 	This variable encodes the prototype of getpwnam_r.
+	It is zero if d_getpwnam_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwnam_r
+	is defined.
 
 getpwuid_r_proto (d_getpwuid_r.U):
 	This variable encodes the prototype of getpwuid_r.
+	It is zero if d_getpwuid_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwuid_r
+	is defined.
 
 getservbyname_r_proto (d_getservbyname_r.U):
 	This variable encodes the prototype of getservbyname_r.
+	It is zero if d_getservbyname_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyname_r
+	is defined.
 
 getservbyport_r_proto (d_getservbyport_r.U):
 	This variable encodes the prototype of getservbyport_r.
+	It is zero if d_getservbyport_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyport_r
+	is defined.
 
 getservent_r_proto (d_getservent_r.U):
 	This variable encodes the prototype of getservent_r.
+	It is zero if d_getservent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservent_r
+	is defined.
 
 getspnam_r_proto (d_getspnam_r.U):
 	This variable encodes the prototype of getspnam_r.
+	It is zero if d_getspnam_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getspnam_r
+	is defined.
 
 gidformat (gidf.U):
 	This variable contains the format string used for printing a Gid_t.
@@ -2440,6 +2533,9 @@ gmake (Loc.U):
 
 gmtime_r_proto (d_gmtime_r.U):
 	This variable encodes the prototype of gmtime_r.
+	It is zero if d_gmtime_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gmtime_r
+	is defined.
 
 grep (Loc.U):
 	This variable is used internally by Configure to determine the
@@ -3115,6 +3211,9 @@ lns (lns.U):
 
 localtime_r_proto (d_localtime_r.U):
 	This variable encodes the prototype of localtime_r.
+	It is zero if d_localtime_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_localtime_r
+	is defined.
 
 locincpth (ccflags.U):
 	This variable contains a list of additional directories to be
@@ -3603,6 +3702,9 @@ randfunc (randfunc.U):
 
 random_r_proto (d_random_r.U):
 	This variable encodes the prototype of random_r.
+	It is zero if d_random_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_random_r
+	is defined.
 
 randseedtype (randfunc.U):
 	Indicates the type of the argument of the seedfunc.
@@ -3620,9 +3722,15 @@ rd_nodata (nblock_io.U):
 
 readdir64_r_proto (d_readdir64_r.U):
 	This variable encodes the prototype of readdir64_r.
+	It is zero if d_readdir64_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir64_r
+	is defined.
 
 readdir_r_proto (d_readdir_r.U):
 	This variable encodes the prototype of readdir_r.
+	It is zero if d_readdir_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir_r
+	is defined.
 
 revision (patchlevel.U):
 	The value of revision comes from the patchlevel.h file.
@@ -3692,24 +3800,45 @@ sendmail (Loc.U):
 
 setgrent_r_proto (d_setgrent_r.U):
 	This variable encodes the prototype of setgrent_r.
+	It is zero if d_setgrent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setgrent_r
+	is defined.
 
 sethostent_r_proto (d_sethostent_r.U):
 	This variable encodes the prototype of sethostent_r.
+	It is zero if d_sethostent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_sethostent_r
+	is defined.
 
 setlocale_r_proto (d_setlocale_r.U):
 	This variable encodes the prototype of setlocale_r.
+	It is zero if d_setlocale_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setlocale_r
+	is defined.
 
 setnetent_r_proto (d_setnetent_r.U):
 	This variable encodes the prototype of setnetent_r.
+	It is zero if d_setnetent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setnetent_r
+	is defined.
 
 setprotoent_r_proto (d_setprotoent_r.U):
 	This variable encodes the prototype of setprotoent_r.
+	It is zero if d_setprotoent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setprotoent_r
+	is defined.
 
 setpwent_r_proto (d_setpwent_r.U):
 	This variable encodes the prototype of setpwent_r.
+	It is zero if d_setpwent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setpwent_r
+	is defined.
 
 setservent_r_proto (d_setservent_r.U):
 	This variable encodes the prototype of setservent_r.
+	It is zero if d_setservent_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setservent_r
+	is defined.
 
 sh (sh.U):
 	This variable contains the full pathname of the shell used
@@ -3955,9 +4084,15 @@ sPRIXU64 (quadfio.U):
 
 srand48_r_proto (d_srand48_r.U):
 	This variable encodes the prototype of srand48_r.
+	It is zero if d_srand48_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srand48_r
+	is defined.
 
 srandom_r_proto (d_srandom_r.U):
 	This variable encodes the prototype of srandom_r.
+	It is zero if d_srandom_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srandom_r
+	is defined.
 
 src (src.U):
 	This variable holds the path to the package source. It is up to
@@ -4029,6 +4164,9 @@ stdio_stream_array (stdio_streams.U):
 
 strerror_r_proto (d_strerror_r.U):
 	This variable encodes the prototype of strerror_r.
+	It is zero if d_strerror_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_strerror_r
+	is defined.
 
 strings (i_string.U):
 	This variable holds the full path of the string header that will be
@@ -4086,6 +4224,9 @@ timetype (d_time.U):
 
 tmpnam_r_proto (d_tmpnam_r.U):
 	This variable encodes the prototype of tmpnam_r.
+	It is zero if d_tmpnam_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_tmpnam_r
+	is defined.
 
 to (Cross.U):
 	This variable contains the command used by Configure
@@ -4115,6 +4256,9 @@ troff (Loc.U):
 
 ttyname_r_proto (d_ttyname_r.U):
 	This variable encodes the prototype of ttyname_r.
+	It is zero if d_ttyname_r is undef, and one of the
+	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ttyname_r
+	is defined.
 
 u16size (perlxv.U):
 	This variable is the size of an U16 in bytes.
diff --git a/Porting/config.sh b/Porting/config.sh
index 58de290dd4..c874082e60 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Wed May  1 06:32:57 EET DST 2002
+# Configuration time: Mon May 20 18:22:54 EET DST 2002
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -63,7 +63,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 May  1 06:32:57 EET DST 2002'
+cf_time='Mon May 20 18:22:54 EET DST 2002'
 charsize='1'
 chgrp=''
 chmod='chmod'
@@ -80,7 +80,7 @@ cppccsymbols='LANGUAGE_C=1'
 cppflags='-std -D_INTRINSICS -ieee -DLANGUAGE_C'
 cpplast=''
 cppminus=''
-cpprun='/usr/bin/cpp'
+cpprun='/usr/local/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'
@@ -769,7 +769,7 @@ patchlevel='7'
 path_sep=':'
 perl5='perl'
 perl=''
-perl_patchlevel='16266'
+perl_patchlevel='16693'
 perladmin='yourname@yourhost.yourplace.com'
 perllibs='-lm -lutil'
 perlpath='/opt/perl/bin/perl5.7.3'
@@ -953,7 +953,7 @@ vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
 version='5.7.3'
-version_patchlevel_string='version 7 subversion 3 patch 16266'
+version_patchlevel_string='version 7 subversion 3 patch 16693'
 versiononly='define'
 vi=''
 voidflags='15'
@@ -983,7 +983,7 @@ PERL_SUBVERSION=3
 PERL_API_REVISION=5
 PERL_API_VERSION=7
 PERL_API_SUBVERSION=3
-PERL_PATCHLEVEL=16266
+PERL_PATCHLEVEL=16693
 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 fc79001d9f..911bd39a5c 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Wed May  1 06:32:57 EET DST 2002
+ * Configuration time: Mon May 20 18:22:54 EET DST 2002
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -1112,7 +1112,7 @@
  */
 #define CPPSTDIN "cppstdin"
 #define CPPMINUS ""
-#define CPPRUN "/usr/bin/cpp"
+#define CPPRUN "/usr/local/bin/cpp"
 #define CPPLAST ""
 
 /* HAS__FWALK:
@@ -1134,6 +1134,9 @@
  */
 /* ASCTIME_R_PROTO:
  *	This symbol encodes the prototype of asctime_r.
+ *	It is zero if d_asctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_asctime_r
+ *	is defined.
  */
 /*#define HAS_ASCTIME_R	   / **/
 #define ASCTIME_R_PROTO 0	   /**/
@@ -1195,6 +1198,9 @@
  */
 /* CRYPT_R_PROTO:
  *	This symbol encodes the prototype of crypt_r.
+ *	It is zero if d_crypt_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_crypt_r
+ *	is defined.
  */
 /*#define HAS_CRYPT_R	   / **/
 #define CRYPT_R_PROTO 0	   /**/
@@ -1216,6 +1222,9 @@
  */
 /* CTIME_R_PROTO:
  *	This symbol encodes the prototype of ctime_r.
+ *	It is zero if d_ctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctime_r
+ *	is defined.
  */
 /*#define HAS_CTIME_R	   / **/
 #define CTIME_R_PROTO 0	   /**/
@@ -1234,6 +1243,9 @@
  */
 /* DRAND48_R_PROTO:
  *	This symbol encodes the prototype of drand48_r.
+ *	It is zero if d_drand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_drand48_r
+ *	is defined.
  */
 /*#define HAS_DRAND48_R	   / **/
 #define DRAND48_R_PROTO 0	   /**/
@@ -1258,6 +1270,9 @@
  */
 /* ENDGRENT_R_PROTO:
  *	This symbol encodes the prototype of endgrent_r.
+ *	It is zero if d_endgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endgrent_r
+ *	is defined.
  */
 /*#define HAS_ENDGRENT_R	   / **/
 #define ENDGRENT_R_PROTO 0	   /**/
@@ -1292,6 +1307,9 @@
  */
 /* ENDPWENT_R_PROTO:
  *	This symbol encodes the prototype of endpwent_r.
+ *	It is zero if d_endpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endpwent_r
+ *	is defined.
  */
 /*#define HAS_ENDPWENT_R	   / **/
 #define ENDPWENT_R_PROTO 0	   /**/
@@ -1480,6 +1498,9 @@
  */
 /* GETGRENT_R_PROTO:
  *	This symbol encodes the prototype of getgrent_r.
+ *	It is zero if d_getgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrent_r
+ *	is defined.
  */
 /*#define HAS_GETGRENT_R	   / **/
 #define GETGRENT_R_PROTO 0	   /**/
@@ -1490,6 +1511,9 @@
  */
 /* GETGRGID_R_PROTO:
  *	This symbol encodes the prototype of getgrgid_r.
+ *	It is zero if d_getgrgid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrgid_r
+ *	is defined.
  */
 /*#define HAS_GETGRGID_R	   / **/
 #define GETGRGID_R_PROTO 0	   /**/
@@ -1500,6 +1524,9 @@
  */
 /* GETGRNAM_R_PROTO:
  *	This symbol encodes the prototype of getgrnam_r.
+ *	It is zero if d_getgrnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrnam_r
+ *	is defined.
  */
 /*#define HAS_GETGRNAM_R	   / **/
 #define GETGRNAM_R_PROTO 0	   /**/
@@ -1571,6 +1598,9 @@
  */
 /* GETLOGIN_R_PROTO:
  *	This symbol encodes the prototype of getlogin_r.
+ *	It is zero if d_getlogin_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getlogin_r
+ *	is defined.
  */
 /*#define HAS_GETLOGIN_R	   / **/
 #define GETLOGIN_R_PROTO 0	   /**/
@@ -1675,6 +1705,9 @@
  */
 /* GETPWENT_R_PROTO:
  *	This symbol encodes the prototype of getpwent_r.
+ *	It is zero if d_getpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwent_r
+ *	is defined.
  */
 /*#define HAS_GETPWENT_R	   / **/
 #define GETPWENT_R_PROTO 0	   /**/
@@ -1685,6 +1718,9 @@
  */
 /* GETPWNAM_R_PROTO:
  *	This symbol encodes the prototype of getpwnam_r.
+ *	It is zero if d_getpwnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwnam_r
+ *	is defined.
  */
 /*#define HAS_GETPWNAM_R	   / **/
 #define GETPWNAM_R_PROTO 0	   /**/
@@ -1695,6 +1731,9 @@
  */
 /* GETPWUID_R_PROTO:
  *	This symbol encodes the prototype of getpwuid_r.
+ *	It is zero if d_getpwuid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwuid_r
+ *	is defined.
  */
 /*#define HAS_GETPWUID_R	   / **/
 #define GETPWUID_R_PROTO 0	   /**/
@@ -1725,6 +1764,9 @@
  */
 /* GETSPNAM_R_PROTO:
  *	This symbol encodes the prototype of getspnam_r.
+ *	It is zero if d_getspnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getspnam_r
+ *	is defined.
  */
 /*#define HAS_GETSPNAM_R	   / **/
 #define GETSPNAM_R_PROTO 0	   /**/
@@ -1746,6 +1788,9 @@
  */
 /* GMTIME_R_PROTO:
  *	This symbol encodes the prototype of gmtime_r.
+ *	It is zero if d_gmtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gmtime_r
+ *	is defined.
  */
 /*#define HAS_GMTIME_R	   / **/
 #define GMTIME_R_PROTO 0	   /**/
@@ -1847,6 +1892,9 @@
  */
 /* LOCALTIME_R_PROTO:
  *	This symbol encodes the prototype of localtime_r.
+ *	It is zero if d_localtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_localtime_r
+ *	is defined.
  */
 /*#define HAS_LOCALTIME_R	   / **/
 #define LOCALTIME_R_PROTO 0	   /**/
@@ -2009,6 +2057,9 @@
  */
 /* RANDOM_R_PROTO:
  *	This symbol encodes the prototype of random_r.
+ *	It is zero if d_random_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_random_r
+ *	is defined.
  */
 /*#define HAS_RANDOM_R	   / **/
 #define RANDOM_R_PROTO 0	   /**/
@@ -2019,6 +2070,9 @@
  */
 /* READDIR_R_PROTO:
  *	This symbol encodes the prototype of readdir_r.
+ *	It is zero if d_readdir_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir_r
+ *	is defined.
  */
 /*#define HAS_READDIR_R	   / **/
 #define READDIR_R_PROTO 0	   /**/
@@ -2092,6 +2146,9 @@
  */
 /* SETGRENT_R_PROTO:
  *	This symbol encodes the prototype of setgrent_r.
+ *	It is zero if d_setgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setgrent_r
+ *	is defined.
  */
 /*#define HAS_SETGRENT_R	   / **/
 #define SETGRENT_R_PROTO 0	   /**/
@@ -2157,6 +2214,9 @@
  */
 /* SETPWENT_R_PROTO:
  *	This symbol encodes the prototype of setpwent_r.
+ *	It is zero if d_setpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setpwent_r
+ *	is defined.
  */
 /*#define HAS_SETPWENT_R	   / **/
 #define SETPWENT_R_PROTO 0	   /**/
@@ -2288,6 +2348,9 @@
  */
 /* SRAND48_R_PROTO:
  *	This symbol encodes the prototype of srand48_r.
+ *	It is zero if d_srand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srand48_r
+ *	is defined.
  */
 /*#define HAS_SRAND48_R	   / **/
 #define SRAND48_R_PROTO 0	   /**/
@@ -2298,6 +2361,9 @@
  */
 /* SRANDOM_R_PROTO:
  *	This symbol encodes the prototype of srandom_r.
+ *	It is zero if d_srandom_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srandom_r
+ *	is defined.
  */
 /*#define HAS_SRANDOM_R	   / **/
 #define SRANDOM_R_PROTO 0	   /**/
@@ -2428,6 +2494,9 @@
  */
 /* STRERROR_R_PROTO:
  *	This symbol encodes the prototype of strerror_r.
+ *	It is zero if d_strerror_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_strerror_r
+ *	is defined.
  */
 /*#define HAS_STRERROR_R	   / **/
 #define STRERROR_R_PROTO 0	   /**/
@@ -2500,6 +2569,9 @@
  */
 /* TMPNAM_R_PROTO:
  *	This symbol encodes the prototype of tmpnam_r.
+ *	It is zero if d_tmpnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_tmpnam_r
+ *	is defined.
  */
 /*#define HAS_TMPNAM_R	   / **/
 #define TMPNAM_R_PROTO 0	   /**/
@@ -3814,7 +3886,9 @@
  *	This symbol, if defined, indicates that you must access
  *	character data through U32-aligned pointers.
  */
+#ifndef U32_ALIGNMENT_REQUIRED
 #define U32_ALIGNMENT_REQUIRED	/**/
+#endif
 
 /* HAS_USLEEP_PROTO:
  *	This symbol, if defined, indicates that the system provides
@@ -3848,6 +3922,9 @@
  */
 /* CTERMID_R_PROTO:
  *	This symbol encodes the prototype of ctermid_r.
+ *	It is zero if d_ctermid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctermid_r
+ *	is defined.
  */
 /*#define HAS_CTERMID_R	   / **/
 #define CTERMID_R_PROTO 0	   /**/
@@ -3858,6 +3935,9 @@
  */
 /* ENDHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of endhostent_r.
+ *	It is zero if d_endhostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endhostent_r
+ *	is defined.
  */
 /*#define HAS_ENDHOSTENT_R	   / **/
 #define ENDHOSTENT_R_PROTO 0	   /**/
@@ -3868,6 +3948,9 @@
  */
 /* ENDNETENT_R_PROTO:
  *	This symbol encodes the prototype of endnetent_r.
+ *	It is zero if d_endnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endnetent_r
+ *	is defined.
  */
 /*#define HAS_ENDNETENT_R	   / **/
 #define ENDNETENT_R_PROTO 0	   /**/
@@ -3878,6 +3961,9 @@
  */
 /* ENDPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of endprotoent_r.
+ *	It is zero if d_endprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endprotoent_r
+ *	is defined.
  */
 /*#define HAS_ENDPROTOENT_R	   / **/
 #define ENDPROTOENT_R_PROTO 0	   /**/
@@ -3888,6 +3974,9 @@
  */
 /* ENDSERVENT_R_PROTO:
  *	This symbol encodes the prototype of endservent_r.
+ *	It is zero if d_endservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endservent_r
+ *	is defined.
  */
 /*#define HAS_ENDSERVENT_R	   / **/
 #define ENDSERVENT_R_PROTO 0	   /**/
@@ -3898,6 +3987,9 @@
  */
 /* GETHOSTBYADDR_R_PROTO:
  *	This symbol encodes the prototype of gethostbyaddr_r.
+ *	It is zero if d_gethostbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyaddr_r
+ *	is defined.
  */
 /*#define HAS_GETHOSTBYADDR_R	   / **/
 #define GETHOSTBYADDR_R_PROTO 0	   /**/
@@ -3908,6 +4000,9 @@
  */
 /* GETHOSTBYNAME_R_PROTO:
  *	This symbol encodes the prototype of gethostbyname_r.
+ *	It is zero if d_gethostbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyname_r
+ *	is defined.
  */
 /*#define HAS_GETHOSTBYNAME_R	   / **/
 #define GETHOSTBYNAME_R_PROTO 0	   /**/
@@ -3918,6 +4013,9 @@
  */
 /* GETHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of gethostent_r.
+ *	It is zero if d_gethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostent_r
+ *	is defined.
  */
 /*#define HAS_GETHOSTENT_R	   / **/
 #define GETHOSTENT_R_PROTO 0	   /**/
@@ -3928,6 +4026,9 @@
  */
 /* GETNETBYADDR_R_PROTO:
  *	This symbol encodes the prototype of getnetbyaddr_r.
+ *	It is zero if d_getnetbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyaddr_r
+ *	is defined.
  */
 /*#define HAS_GETNETBYADDR_R	   / **/
 #define GETNETBYADDR_R_PROTO 0	   /**/
@@ -3938,6 +4039,9 @@
  */
 /* GETNETBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getnetbyname_r.
+ *	It is zero if d_getnetbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyname_r
+ *	is defined.
  */
 /*#define HAS_GETNETBYNAME_R	   / **/
 #define GETNETBYNAME_R_PROTO 0	   /**/
@@ -3948,6 +4052,9 @@
  */
 /* GETNETENT_R_PROTO:
  *	This symbol encodes the prototype of getnetent_r.
+ *	It is zero if d_getnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetent_r
+ *	is defined.
  */
 /*#define HAS_GETNETENT_R	   / **/
 #define GETNETENT_R_PROTO 0	   /**/
@@ -3958,6 +4065,9 @@
  */
 /* GETPROTOBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getprotobyname_r.
+ *	It is zero if d_getprotobyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobyname_r
+ *	is defined.
  */
 /*#define HAS_GETPROTOBYNAME_R	   / **/
 #define GETPROTOBYNAME_R_PROTO 0	   /**/
@@ -3968,6 +4078,9 @@
  */
 /* GETPROTOBYNUMBER_R_PROTO:
  *	This symbol encodes the prototype of getprotobynumber_r.
+ *	It is zero if d_getprotobynumber_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobynumber_r
+ *	is defined.
  */
 /*#define HAS_GETPROTOBYNUMBER_R	   / **/
 #define GETPROTOBYNUMBER_R_PROTO 0	   /**/
@@ -3978,6 +4091,9 @@
  */
 /* GETPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of getprotoent_r.
+ *	It is zero if d_getprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotoent_r
+ *	is defined.
  */
 /*#define HAS_GETPROTOENT_R	   / **/
 #define GETPROTOENT_R_PROTO 0	   /**/
@@ -3988,6 +4104,9 @@
  */
 /* GETSERVBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getservbyname_r.
+ *	It is zero if d_getservbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyname_r
+ *	is defined.
  */
 /*#define HAS_GETSERVBYNAME_R	   / **/
 #define GETSERVBYNAME_R_PROTO 0	   /**/
@@ -3998,6 +4117,9 @@
  */
 /* GETSERVBYPORT_R_PROTO:
  *	This symbol encodes the prototype of getservbyport_r.
+ *	It is zero if d_getservbyport_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyport_r
+ *	is defined.
  */
 /*#define HAS_GETSERVBYPORT_R	   / **/
 #define GETSERVBYPORT_R_PROTO 0	   /**/
@@ -4008,6 +4130,9 @@
  */
 /* GETSERVENT_R_PROTO:
  *	This symbol encodes the prototype of getservent_r.
+ *	It is zero if d_getservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservent_r
+ *	is defined.
  */
 /*#define HAS_GETSERVENT_R	   / **/
 #define GETSERVENT_R_PROTO 0	   /**/
@@ -4024,6 +4149,9 @@
  */
 /* READDIR64_R_PROTO:
  *	This symbol encodes the prototype of readdir64_r.
+ *	It is zero if d_readdir64_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir64_r
+ *	is defined.
  */
 /*#define HAS_READDIR64_R	   / **/
 #define READDIR64_R_PROTO 0	   /**/
@@ -4034,6 +4162,9 @@
  */
 /* SETHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of sethostent_r.
+ *	It is zero if d_sethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_sethostent_r
+ *	is defined.
  */
 /*#define HAS_SETHOSTENT_R	   / **/
 #define SETHOSTENT_R_PROTO 0	   /**/
@@ -4044,6 +4175,9 @@
  */
 /* SETLOCALE_R_PROTO:
  *	This symbol encodes the prototype of setlocale_r.
+ *	It is zero if d_setlocale_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setlocale_r
+ *	is defined.
  */
 /*#define HAS_SETLOCALE_R	   / **/
 #define SETLOCALE_R_PROTO 0	   /**/
@@ -4054,6 +4188,9 @@
  */
 /* SETNETENT_R_PROTO:
  *	This symbol encodes the prototype of setnetent_r.
+ *	It is zero if d_setnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setnetent_r
+ *	is defined.
  */
 /*#define HAS_SETNETENT_R	   / **/
 #define SETNETENT_R_PROTO 0	   /**/
@@ -4064,6 +4201,9 @@
  */
 /* SETPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of setprotoent_r.
+ *	It is zero if d_setprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setprotoent_r
+ *	is defined.
  */
 /*#define HAS_SETPROTOENT_R	   / **/
 #define SETPROTOENT_R_PROTO 0	   /**/
@@ -4074,6 +4214,9 @@
  */
 /* SETSERVENT_R_PROTO:
  *	This symbol encodes the prototype of setservent_r.
+ *	It is zero if d_setservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setservent_r
+ *	is defined.
  */
 /*#define HAS_SETSERVENT_R	   / **/
 #define SETSERVENT_R_PROTO 0	   /**/
@@ -4084,6 +4227,9 @@
  */
 /* TTYNAME_R_PROTO:
  *	This symbol encodes the prototype of ttyname_r.
+ *	It is zero if d_ttyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ttyname_r
+ *	is defined.
  */
 /*#define HAS_TTYNAME_R	   / **/
 #define TTYNAME_R_PROTO 0	   /**/
diff --git a/config_h.SH b/config_h.SH
index 2edf2b179c..5945dd5cad 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -1154,6 +1154,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* ASCTIME_R_PROTO:
  *	This symbol encodes the prototype of asctime_r.
+ *	It is zero if d_asctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_asctime_r
+ *	is defined.
  */
 #$d_asctime_r HAS_ASCTIME_R	   /**/
 #define ASCTIME_R_PROTO $asctime_r_proto	   /**/
@@ -1215,6 +1218,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* CRYPT_R_PROTO:
  *	This symbol encodes the prototype of crypt_r.
+ *	It is zero if d_crypt_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_crypt_r
+ *	is defined.
  */
 #$d_crypt_r HAS_CRYPT_R	   /**/
 #define CRYPT_R_PROTO $crypt_r_proto	   /**/
@@ -1236,6 +1242,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* CTIME_R_PROTO:
  *	This symbol encodes the prototype of ctime_r.
+ *	It is zero if d_ctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctime_r
+ *	is defined.
  */
 #$d_ctime_r HAS_CTIME_R	   /**/
 #define CTIME_R_PROTO $ctime_r_proto	   /**/
@@ -1254,6 +1263,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* DRAND48_R_PROTO:
  *	This symbol encodes the prototype of drand48_r.
+ *	It is zero if d_drand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_drand48_r
+ *	is defined.
  */
 #$d_drand48_r HAS_DRAND48_R	   /**/
 #define DRAND48_R_PROTO $drand48_r_proto	   /**/
@@ -1278,6 +1290,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* ENDGRENT_R_PROTO:
  *	This symbol encodes the prototype of endgrent_r.
+ *	It is zero if d_endgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endgrent_r
+ *	is defined.
  */
 #$d_endgrent_r HAS_ENDGRENT_R	   /**/
 #define ENDGRENT_R_PROTO $endgrent_r_proto	   /**/
@@ -1312,6 +1327,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* ENDPWENT_R_PROTO:
  *	This symbol encodes the prototype of endpwent_r.
+ *	It is zero if d_endpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endpwent_r
+ *	is defined.
  */
 #$d_endpwent_r HAS_ENDPWENT_R	   /**/
 #define ENDPWENT_R_PROTO $endpwent_r_proto	   /**/
@@ -1500,6 +1518,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETGRENT_R_PROTO:
  *	This symbol encodes the prototype of getgrent_r.
+ *	It is zero if d_getgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrent_r
+ *	is defined.
  */
 #$d_getgrent_r HAS_GETGRENT_R	   /**/
 #define GETGRENT_R_PROTO $getgrent_r_proto	   /**/
@@ -1510,6 +1531,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETGRGID_R_PROTO:
  *	This symbol encodes the prototype of getgrgid_r.
+ *	It is zero if d_getgrgid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrgid_r
+ *	is defined.
  */
 #$d_getgrgid_r HAS_GETGRGID_R	   /**/
 #define GETGRGID_R_PROTO $getgrgid_r_proto	   /**/
@@ -1520,6 +1544,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETGRNAM_R_PROTO:
  *	This symbol encodes the prototype of getgrnam_r.
+ *	It is zero if d_getgrnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrnam_r
+ *	is defined.
  */
 #$d_getgrnam_r HAS_GETGRNAM_R	   /**/
 #define GETGRNAM_R_PROTO $getgrnam_r_proto	   /**/
@@ -1591,6 +1618,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETLOGIN_R_PROTO:
  *	This symbol encodes the prototype of getlogin_r.
+ *	It is zero if d_getlogin_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getlogin_r
+ *	is defined.
  */
 #$d_getlogin_r HAS_GETLOGIN_R	   /**/
 #define GETLOGIN_R_PROTO $getlogin_r_proto	   /**/
@@ -1695,6 +1725,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETPWENT_R_PROTO:
  *	This symbol encodes the prototype of getpwent_r.
+ *	It is zero if d_getpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwent_r
+ *	is defined.
  */
 #$d_getpwent_r HAS_GETPWENT_R	   /**/
 #define GETPWENT_R_PROTO $getpwent_r_proto	   /**/
@@ -1705,6 +1738,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETPWNAM_R_PROTO:
  *	This symbol encodes the prototype of getpwnam_r.
+ *	It is zero if d_getpwnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwnam_r
+ *	is defined.
  */
 #$d_getpwnam_r HAS_GETPWNAM_R	   /**/
 #define GETPWNAM_R_PROTO $getpwnam_r_proto	   /**/
@@ -1715,6 +1751,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETPWUID_R_PROTO:
  *	This symbol encodes the prototype of getpwuid_r.
+ *	It is zero if d_getpwuid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwuid_r
+ *	is defined.
  */
 #$d_getpwuid_r HAS_GETPWUID_R	   /**/
 #define GETPWUID_R_PROTO $getpwuid_r_proto	   /**/
@@ -1745,6 +1784,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETSPNAM_R_PROTO:
  *	This symbol encodes the prototype of getspnam_r.
+ *	It is zero if d_getspnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getspnam_r
+ *	is defined.
  */
 #$d_getspnam_r HAS_GETSPNAM_R	   /**/
 #define GETSPNAM_R_PROTO $getspnam_r_proto	   /**/
@@ -1766,6 +1808,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GMTIME_R_PROTO:
  *	This symbol encodes the prototype of gmtime_r.
+ *	It is zero if d_gmtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gmtime_r
+ *	is defined.
  */
 #$d_gmtime_r HAS_GMTIME_R	   /**/
 #define GMTIME_R_PROTO $gmtime_r_proto	   /**/
@@ -1867,6 +1912,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* LOCALTIME_R_PROTO:
  *	This symbol encodes the prototype of localtime_r.
+ *	It is zero if d_localtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_localtime_r
+ *	is defined.
  */
 #$d_localtime_r HAS_LOCALTIME_R	   /**/
 #define LOCALTIME_R_PROTO $localtime_r_proto	   /**/
@@ -2029,6 +2077,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* RANDOM_R_PROTO:
  *	This symbol encodes the prototype of random_r.
+ *	It is zero if d_random_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_random_r
+ *	is defined.
  */
 #$d_random_r HAS_RANDOM_R	   /**/
 #define RANDOM_R_PROTO $random_r_proto	   /**/
@@ -2039,6 +2090,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* READDIR_R_PROTO:
  *	This symbol encodes the prototype of readdir_r.
+ *	It is zero if d_readdir_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir_r
+ *	is defined.
  */
 #$d_readdir_r HAS_READDIR_R	   /**/
 #define READDIR_R_PROTO $readdir_r_proto	   /**/
@@ -2112,6 +2166,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* SETGRENT_R_PROTO:
  *	This symbol encodes the prototype of setgrent_r.
+ *	It is zero if d_setgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setgrent_r
+ *	is defined.
  */
 #$d_setgrent_r HAS_SETGRENT_R	   /**/
 #define SETGRENT_R_PROTO $setgrent_r_proto	   /**/
@@ -2177,6 +2234,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* SETPWENT_R_PROTO:
  *	This symbol encodes the prototype of setpwent_r.
+ *	It is zero if d_setpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setpwent_r
+ *	is defined.
  */
 #$d_setpwent_r HAS_SETPWENT_R	   /**/
 #define SETPWENT_R_PROTO $setpwent_r_proto	   /**/
@@ -2308,6 +2368,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* SRAND48_R_PROTO:
  *	This symbol encodes the prototype of srand48_r.
+ *	It is zero if d_srand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srand48_r
+ *	is defined.
  */
 #$d_srand48_r HAS_SRAND48_R	   /**/
 #define SRAND48_R_PROTO $srand48_r_proto	   /**/
@@ -2318,6 +2381,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* SRANDOM_R_PROTO:
  *	This symbol encodes the prototype of srandom_r.
+ *	It is zero if d_srandom_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srandom_r
+ *	is defined.
  */
 #$d_srandom_r HAS_SRANDOM_R	   /**/
 #define SRANDOM_R_PROTO $srandom_r_proto	   /**/
@@ -2448,6 +2514,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* STRERROR_R_PROTO:
  *	This symbol encodes the prototype of strerror_r.
+ *	It is zero if d_strerror_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_strerror_r
+ *	is defined.
  */
 #$d_strerror_r HAS_STRERROR_R	   /**/
 #define STRERROR_R_PROTO $strerror_r_proto	   /**/
@@ -2520,6 +2589,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* TMPNAM_R_PROTO:
  *	This symbol encodes the prototype of tmpnam_r.
+ *	It is zero if d_tmpnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_tmpnam_r
+ *	is defined.
  */
 #$d_tmpnam_r HAS_TMPNAM_R	   /**/
 #define TMPNAM_R_PROTO $tmpnam_r_proto	   /**/
@@ -3870,6 +3942,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* CTERMID_R_PROTO:
  *	This symbol encodes the prototype of ctermid_r.
+ *	It is zero if d_ctermid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctermid_r
+ *	is defined.
  */
 #$d_ctermid_r HAS_CTERMID_R	   /**/
 #define CTERMID_R_PROTO $ctermid_r_proto	   /**/
@@ -3880,6 +3955,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* ENDHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of endhostent_r.
+ *	It is zero if d_endhostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endhostent_r
+ *	is defined.
  */
 #$d_endhostent_r HAS_ENDHOSTENT_R	   /**/
 #define ENDHOSTENT_R_PROTO $endhostent_r_proto	   /**/
@@ -3890,6 +3968,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* ENDNETENT_R_PROTO:
  *	This symbol encodes the prototype of endnetent_r.
+ *	It is zero if d_endnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endnetent_r
+ *	is defined.
  */
 #$d_endnetent_r HAS_ENDNETENT_R	   /**/
 #define ENDNETENT_R_PROTO $endnetent_r_proto	   /**/
@@ -3900,6 +3981,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* ENDPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of endprotoent_r.
+ *	It is zero if d_endprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endprotoent_r
+ *	is defined.
  */
 #$d_endprotoent_r HAS_ENDPROTOENT_R	   /**/
 #define ENDPROTOENT_R_PROTO $endprotoent_r_proto	   /**/
@@ -3910,6 +3994,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* ENDSERVENT_R_PROTO:
  *	This symbol encodes the prototype of endservent_r.
+ *	It is zero if d_endservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endservent_r
+ *	is defined.
  */
 #$d_endservent_r HAS_ENDSERVENT_R	   /**/
 #define ENDSERVENT_R_PROTO $endservent_r_proto	   /**/
@@ -3920,6 +4007,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETHOSTBYADDR_R_PROTO:
  *	This symbol encodes the prototype of gethostbyaddr_r.
+ *	It is zero if d_gethostbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyaddr_r
+ *	is defined.
  */
 #$d_gethostbyaddr_r HAS_GETHOSTBYADDR_R	   /**/
 #define GETHOSTBYADDR_R_PROTO $gethostbyaddr_r_proto	   /**/
@@ -3930,6 +4020,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETHOSTBYNAME_R_PROTO:
  *	This symbol encodes the prototype of gethostbyname_r.
+ *	It is zero if d_gethostbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyname_r
+ *	is defined.
  */
 #$d_gethostbyname_r HAS_GETHOSTBYNAME_R	   /**/
 #define GETHOSTBYNAME_R_PROTO $gethostbyname_r_proto	   /**/
@@ -3940,6 +4033,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of gethostent_r.
+ *	It is zero if d_gethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostent_r
+ *	is defined.
  */
 #$d_gethostent_r HAS_GETHOSTENT_R	   /**/
 #define GETHOSTENT_R_PROTO $gethostent_r_proto	   /**/
@@ -3950,6 +4046,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETNETBYADDR_R_PROTO:
  *	This symbol encodes the prototype of getnetbyaddr_r.
+ *	It is zero if d_getnetbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyaddr_r
+ *	is defined.
  */
 #$d_getnetbyaddr_r HAS_GETNETBYADDR_R	   /**/
 #define GETNETBYADDR_R_PROTO $getnetbyaddr_r_proto	   /**/
@@ -3960,6 +4059,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETNETBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getnetbyname_r.
+ *	It is zero if d_getnetbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyname_r
+ *	is defined.
  */
 #$d_getnetbyname_r HAS_GETNETBYNAME_R	   /**/
 #define GETNETBYNAME_R_PROTO $getnetbyname_r_proto	   /**/
@@ -3970,6 +4072,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETNETENT_R_PROTO:
  *	This symbol encodes the prototype of getnetent_r.
+ *	It is zero if d_getnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetent_r
+ *	is defined.
  */
 #$d_getnetent_r HAS_GETNETENT_R	   /**/
 #define GETNETENT_R_PROTO $getnetent_r_proto	   /**/
@@ -3980,6 +4085,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETPROTOBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getprotobyname_r.
+ *	It is zero if d_getprotobyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobyname_r
+ *	is defined.
  */
 #$d_getprotobyname_r HAS_GETPROTOBYNAME_R	   /**/
 #define GETPROTOBYNAME_R_PROTO $getprotobyname_r_proto	   /**/
@@ -3990,6 +4098,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETPROTOBYNUMBER_R_PROTO:
  *	This symbol encodes the prototype of getprotobynumber_r.
+ *	It is zero if d_getprotobynumber_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobynumber_r
+ *	is defined.
  */
 #$d_getprotobynumber_r HAS_GETPROTOBYNUMBER_R	   /**/
 #define GETPROTOBYNUMBER_R_PROTO $getprotobynumber_r_proto	   /**/
@@ -4000,6 +4111,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of getprotoent_r.
+ *	It is zero if d_getprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotoent_r
+ *	is defined.
  */
 #$d_getprotoent_r HAS_GETPROTOENT_R	   /**/
 #define GETPROTOENT_R_PROTO $getprotoent_r_proto	   /**/
@@ -4010,6 +4124,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETSERVBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getservbyname_r.
+ *	It is zero if d_getservbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyname_r
+ *	is defined.
  */
 #$d_getservbyname_r HAS_GETSERVBYNAME_R	   /**/
 #define GETSERVBYNAME_R_PROTO $getservbyname_r_proto	   /**/
@@ -4020,6 +4137,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETSERVBYPORT_R_PROTO:
  *	This symbol encodes the prototype of getservbyport_r.
+ *	It is zero if d_getservbyport_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyport_r
+ *	is defined.
  */
 #$d_getservbyport_r HAS_GETSERVBYPORT_R	   /**/
 #define GETSERVBYPORT_R_PROTO $getservbyport_r_proto	   /**/
@@ -4030,6 +4150,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* GETSERVENT_R_PROTO:
  *	This symbol encodes the prototype of getservent_r.
+ *	It is zero if d_getservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservent_r
+ *	is defined.
  */
 #$d_getservent_r HAS_GETSERVENT_R	   /**/
 #define GETSERVENT_R_PROTO $getservent_r_proto	   /**/
@@ -4046,6 +4169,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* READDIR64_R_PROTO:
  *	This symbol encodes the prototype of readdir64_r.
+ *	It is zero if d_readdir64_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir64_r
+ *	is defined.
  */
 #$d_readdir64_r HAS_READDIR64_R	   /**/
 #define READDIR64_R_PROTO $readdir64_r_proto	   /**/
@@ -4056,6 +4182,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* SETHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of sethostent_r.
+ *	It is zero if d_sethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_sethostent_r
+ *	is defined.
  */
 #$d_sethostent_r HAS_SETHOSTENT_R	   /**/
 #define SETHOSTENT_R_PROTO $sethostent_r_proto	   /**/
@@ -4066,6 +4195,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* SETLOCALE_R_PROTO:
  *	This symbol encodes the prototype of setlocale_r.
+ *	It is zero if d_setlocale_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setlocale_r
+ *	is defined.
  */
 #$d_setlocale_r HAS_SETLOCALE_R	   /**/
 #define SETLOCALE_R_PROTO $setlocale_r_proto	   /**/
@@ -4076,6 +4208,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* SETNETENT_R_PROTO:
  *	This symbol encodes the prototype of setnetent_r.
+ *	It is zero if d_setnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setnetent_r
+ *	is defined.
  */
 #$d_setnetent_r HAS_SETNETENT_R	   /**/
 #define SETNETENT_R_PROTO $setnetent_r_proto	   /**/
@@ -4086,6 +4221,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* SETPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of setprotoent_r.
+ *	It is zero if d_setprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setprotoent_r
+ *	is defined.
  */
 #$d_setprotoent_r HAS_SETPROTOENT_R	   /**/
 #define SETPROTOENT_R_PROTO $setprotoent_r_proto	   /**/
@@ -4096,6 +4234,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* SETSERVENT_R_PROTO:
  *	This symbol encodes the prototype of setservent_r.
+ *	It is zero if d_setservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setservent_r
+ *	is defined.
  */
 #$d_setservent_r HAS_SETSERVENT_R	   /**/
 #define SETSERVENT_R_PROTO $setservent_r_proto	   /**/
@@ -4106,6 +4247,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* TTYNAME_R_PROTO:
  *	This symbol encodes the prototype of ttyname_r.
+ *	It is zero if d_ttyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ttyname_r
+ *	is defined.
  */
 #$d_ttyname_r HAS_TTYNAME_R	   /**/
 #define TTYNAME_R_PROTO $ttyname_r_proto	   /**/
diff --git a/reentr.pl b/reentr.pl
index 19b9852f7b..cb9aca82db 100644
--- a/reentr.pl
+++ b/reentr.pl
@@ -204,6 +204,9 @@ while (<DATA>) { # Read in the protypes.
 ?S:.
 ?S:${func}_r_proto:
 ?S:	This variable encodes the prototype of ${func}_r.
+?S:	It is zero if d_${func}_r is undef, and one of the
+?S:	REENTRANT_PROTO_T_ABC macros of reentr.h if d_${func}_r
+?S:	is defined.
 ?S:.
 ?C:HAS_${FUNC}_R:
 ?C:	This symbol, if defined, indicates that the ${func}_r routine
@@ -211,6 +214,9 @@ while (<DATA>) { # Read in the protypes.
 ?C:.
 ?C:${FUNC}_R_PROTO:
 ?C:	This symbol encodes the prototype of ${func}_r.
+?C:	It is zero if d_${func}_r is undef, and one of the
+?C:	REENTRANT_PROTO_T_ABC macros of reentr.h if d_${func}_r
+?C:	is defined.
 ?C:.
 ?H:#\$d_${func}_r HAS_${FUNC}_R	   /**/
 ?H:#define ${FUNC}_R_PROTO \$${func}_r_proto	   /**/