Configure-related tweaks.

p4raw-id: //depot/perl@15612

3 files changed, 187 insertions, 183 deletions

diff --git a/Porting/Glossary b/Porting/Glossary
index a9b86e2fad..4030a01379 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -1315,10 +1315,6 @@ d_nv_preserves_uv (perlxv.U):
 	This variable indicates whether a variable of type nvtype
 	can preserve all the bits a variable of type uvtype.
 
-nv_preserves_uv_bits (perlxv.U):
-	This variable indicates how many of bits type uvtype
-	a variable nvtype can preserve.
-
 d_off64_t (d_off64_t.U):
 	This symbol will be defined if the C compiler supports off64_t.
 
@@ -3367,6 +3363,10 @@ nroff (Loc.U):
 	full pathname (if any) of the nroff program.  After Configure runs,
 	the value is reset to a plain "nroff" and is not useful.
 
+nv_preserves_uv_bits (perlxv.U):
+	This variable indicates how many of bits type uvtype
+	a variable nvtype can preserve.
+
 nveformat (perlxvf.U):
 	This variable contains the format string used for printing
 	a Perl NV using %e-ish floating point format.
diff --git a/Porting/config.sh b/Porting/config.sh
index 416c87be06..ef9a1e7f37 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Fri Mar 15 17:39:35 EET 2002
+# Configuration time: Fri Mar 29 20:37:35 EET 2002
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -41,7 +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'
+asctime_r_proto='0'
 awk='awk'
 baserev='5.0'
 bash=''
@@ -64,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='Fri Mar 15 17:39:35 EET 2002'
+cf_time='Fri Mar 29 20:37:35 EET 2002'
 charsize='1'
 chgrp=''
 chmod='chmod'
@@ -88,7 +88,7 @@ crypt_r_proto='0'
 cryptlib=''
 csh='csh'
 ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
+ctime_r_proto='0'
 d_Gconvert='sprintf((b),"%.*g",(n),(x))'
 d_PRIEUldbl='define'
 d_PRIFUldbl='define'
@@ -108,7 +108,7 @@ d_access='define'
 d_accessx='undef'
 d_alarm='define'
 d_archlib='define'
-d_asctime_r='define'
+d_asctime_r='undef'
 d_atolf='undef'
 d_atoll='undef'
 d_attribut='undef'
@@ -133,7 +133,7 @@ d_crypt='define'
 d_crypt_r='undef'
 d_csh='define'
 d_ctermid_r='undef'
-d_ctime_r='define'
+d_ctime_r='undef'
 d_cuserid='define'
 d_dbl_dig='define'
 d_dbminitproto='undef'
@@ -144,22 +144,22 @@ d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
 d_dosuid='undef'
-d_drand48_r='define'
+d_drand48_r='undef'
 d_drand48proto='define'
 d_dup2='define'
 d_eaccess='undef'
 d_endgrent='define'
-d_endgrent_r='define'
+d_endgrent_r='undef'
 d_endhent='define'
-d_endhostent_r='define'
+d_endhostent_r='undef'
 d_endnent='define'
-d_endnetent_r='define'
+d_endnetent_r='undef'
 d_endpent='define'
-d_endprotoent_r='define'
+d_endprotoent_r='undef'
 d_endpwent='define'
-d_endpwent_r='define'
+d_endpwent_r='undef'
 d_endsent='define'
-d_endservent_r='define'
+d_endservent_r='undef'
 d_eofnblk='define'
 d_eunice='undef'
 d_fchdir='define'
@@ -196,29 +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_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
 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_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
 d_gethostprotos='define'
 d_getitimer='define'
 d_getlogin='define'
-d_getlogin_r='define'
+d_getlogin_r='undef'
 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_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
 d_getnetprotos='define'
 d_getpagsz='define'
 d_getpbyname='define'
@@ -229,26 +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_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
 d_getprotoprotos='define'
 d_getprpwnam='undef'
 d_getpwent='define'
-d_getpwent_r='define'
-d_getpwnam_r='define'
-d_getpwuid_r='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
 d_getsbyname='define'
 d_getsbyport='define'
 d_getsent='define'
-d_getservbyname_r='define'
-d_getservbyport_r='define'
-d_getservent_r='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
 d_getservprotos='define'
 d_getspnam='undef'
 d_getspnam_r='undef'
 d_gettimeod='define'
-d_gmtime_r='define'
+d_gmtime_r='undef'
 d_gnulibc='undef'
 d_grpasswd='define'
 d_hasmntopt='undef'
@@ -265,7 +265,7 @@ d_killpg='define'
 d_lchown='define'
 d_ldbl_dig='define'
 d_link='define'
-d_localtime_r='define'
+d_localtime_r='undef'
 d_locconv='define'
 d_lockf='define'
 d_longdbl='define'
@@ -308,7 +308,6 @@ d_mymalloc='undef'
 d_nice='define'
 d_nl_langinfo='define'
 d_nv_preserves_uv='undef'
-nv_preserves_uv_bits='53'
 d_off64_t='undef'
 d_old_pthread_create_joinable='undef'
 d_oldpthreads='undef'
@@ -334,10 +333,10 @@ d_pwpasswd='define'
 d_pwquota='define'
 d_qgcvt='undef'
 d_quad='define'
-d_random_r='define'
+d_random_r='undef'
 d_readdir64_r='undef'
 d_readdir='define'
-d_readdir_r='define'
+d_readdir_r='undef'
 d_readlink='define'
 d_readv='define'
 d_recvmsg='define'
@@ -362,25 +361,25 @@ d_sendmsg='define'
 d_setegid='define'
 d_seteuid='define'
 d_setgrent='define'
-d_setgrent_r='define'
+d_setgrent_r='undef'
 d_setgrps='define'
 d_sethent='define'
-d_sethostent_r='define'
+d_sethostent_r='undef'
 d_setitimer='define'
 d_setlinebuf='define'
 d_setlocale='define'
 d_setlocale_r='undef'
 d_setnent='define'
-d_setnetent_r='define'
+d_setnetent_r='undef'
 d_setpent='define'
 d_setpgid='define'
 d_setpgrp2='undef'
 d_setpgrp='define'
 d_setprior='define'
 d_setproctitle='undef'
-d_setprotoent_r='define'
+d_setprotoent_r='undef'
 d_setpwent='define'
-d_setpwent_r='define'
+d_setpwent_r='undef'
 d_setregid='define'
 d_setresgid='undef'
 d_setresuid='undef'
@@ -388,7 +387,7 @@ d_setreuid='define'
 d_setrgid='define'
 d_setruid='define'
 d_setsent='define'
-d_setservent_r='define'
+d_setservent_r='undef'
 d_setsid='define'
 d_setvbuf='define'
 d_sfio='undef'
@@ -408,8 +407,8 @@ d_socklen_t='undef'
 d_sockpair='define'
 d_socks5_init='undef'
 d_sqrtl='define'
-d_srand48_r='define'
-d_srandom_r='define'
+d_srand48_r='undef'
+d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='define'
@@ -428,7 +427,7 @@ d_strcoll='define'
 d_strctcpy='define'
 d_strerrm='strerror(e)'
 d_strerror='define'
-d_strerror_r='define'
+d_strerror_r='undef'
 d_strftime='define'
 d_strtod='define'
 d_strtol='define'
@@ -457,7 +456,7 @@ d_tm_tm_gmtoff='define'
 d_tm_tm_zone='define'
 d_tmpnam_r='undef'
 d_truncate='define'
-d_ttyname_r='define'
+d_ttyname_r='undef'
 d_tzname='define'
 d_u32align='define'
 d_ualarm='define'
@@ -495,23 +494,23 @@ 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'
+drand48_r_proto='0'
+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'
 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'
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='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 Errno'
+extensions='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 Errno'
 extras=''
 fflushNULL='define'
 fflushall='undef'
@@ -527,25 +526,25 @@ 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'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
 getspnam_r_proto='0'
 gidformat='"u"'
 gidsign='1'
@@ -553,7 +552,7 @@ 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'
+gmtime_r_proto='0'
 grep='grep'
 groupcat='cat /etc/group'
 groupstype='gid_t'
@@ -653,7 +652,7 @@ i_varargs='undef'
 i_varhdr='stdarg.h'
 i_vfork='undef'
 ignore_versioned_solibs=''
-inc_version_list=' '
+inc_version_list=''
 inc_version_list_init='0'
 incpath=''
 inews=''
@@ -678,7 +677,7 @@ issymlink='test -h'
 ivdformat='"ld"'
 ivsize='8'
 ivtype='long'
-known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File 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 Thread Time/HiRes Unicode/Normalize XS/Typemap attrs re threads threads/shared Encode/CN Encode/JP Encode/KR Encode/TW'
+known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File 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 Thread Time/HiRes Unicode/Normalize XS/Typemap attrs re threads threads/shared'
 ksh=''
 ld='ld'
 lddlflags='-shared -expect_unresolved "*" -msym -std -s'
@@ -702,7 +701,7 @@ lint=''
 lkflags=''
 ln='ln'
 lns='/usr/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
+localtime_r_proto='0'
 locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
 loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
 longdblsize='8'
@@ -751,6 +750,7 @@ nroff='nroff'
 nvEUformat='"E"'
 nvFUformat='"F"'
 nvGUformat='"G"'
+nv_preserves_uv_bits='53'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
@@ -771,7 +771,7 @@ patchlevel='7'
 path_sep=':'
 perl5='perl'
 perl=''
-perl_patchlevel='15172'
+perl_patchlevel='15605'
 perladmin='yourname@yourhost.yourplace.com'
 perllibs='-lm -lutil'
 perlpath='/opt/perl/bin/perl5.7.3'
@@ -793,12 +793,12 @@ quadkind='2'
 quadtype='long'
 randbits='48'
 randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_TS'
+random_r_proto='0'
 randseedtype='long'
 ranlib=':'
 rd_nodata='-1'
 readdir64_r_proto='0'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
+readdir_r_proto='0'
 revision='5'
 rm='rm'
 rmail=''
@@ -825,13 +825,13 @@ seedfunc='srand48'
 selectminbits='32'
 selecttype='fd_set *'
 sendmail=''
-setgrent_r_proto='REENTRANT_PROTO_I_H'
-sethostent_r_proto='REENTRANT_PROTO_I_ID'
+setgrent_r_proto='0'
+sethostent_r_proto='0'
 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'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
 sh='/bin/sh'
 shar=''
 sharpbang='#!'
@@ -866,8 +866,8 @@ socksizetype='int'
 sort='sort'
 spackage='Perl5'
 spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
+srand48_r_proto='0'
+srandom_r_proto='0'
 src='.'
 ssizetype='ssize_t'
 startperl='#!/opt/perl/bin/perl5.7.3'
@@ -880,7 +880,7 @@ stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
 stdio_stream_array='_iob'
-strerror_r_proto='REENTRANT_PROTO_I_IBW'
+strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
 subversion='3'
@@ -899,7 +899,7 @@ touch='touch'
 tr='tr'
 trnl='\n'
 troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
+ttyname_r_proto='0'
 u16size='2'
 u16type='unsigned short'
 u32size='4'
@@ -955,7 +955,7 @@ vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
 version='5.7.3'
-version_patchlevel_string='version 7 subversion 3 patch 15172'
+version_patchlevel_string='version 7 subversion 3 patch 15605'
 versiononly='define'
 vi=''
 voidflags='15'
@@ -985,7 +985,7 @@ PERL_SUBVERSION=3
 PERL_API_REVISION=5
 PERL_API_VERSION=5
 PERL_API_SUBVERSION=0
-PERL_PATCHLEVEL=15172
+PERL_PATCHLEVEL=15605
 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 21639fddbf..6e72d9daec 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Fri Mar 15 17:39:35 EET 2002
+ * Configuration time: Fri Mar 29 20:37:35 EET 2002
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -1143,8 +1143,8 @@
 /* ASCTIME_R_PROTO:
  *	This symbol encodes the prototype of asctime_r.
  */
-#define HAS_ASCTIME_R	   /**/
-#define ASCTIME_R_PROTO REENTRANT_PROTO_B_SB	   /**/
+/*#define HAS_ASCTIME_R	   / **/
+#define ASCTIME_R_PROTO 0	   /**/
 
 /* CASTI32:
  *	This symbol is defined if the C compiler can cast negative
@@ -1225,8 +1225,8 @@
 /* CTIME_R_PROTO:
  *	This symbol encodes the prototype of ctime_r.
  */
-#define HAS_CTIME_R	   /**/
-#define CTIME_R_PROTO REENTRANT_PROTO_B_SB	   /**/
+/*#define HAS_CTIME_R	   / **/
+#define CTIME_R_PROTO 0	   /**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *	This symbol, if defined, indicates that we need to prepend an
@@ -1243,8 +1243,8 @@
 /* DRAND48_R_PROTO:
  *	This symbol encodes the prototype of drand48_r.
  */
-#define HAS_DRAND48_R	   /**/
-#define DRAND48_R_PROTO REENTRANT_PROTO_I_ST	   /**/
+/*#define HAS_DRAND48_R	   / **/
+#define DRAND48_R_PROTO 0	   /**/
 
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
@@ -1267,8 +1267,8 @@
 /* ENDGRENT_R_PROTO:
  *	This symbol encodes the prototype of endgrent_r.
  */
-#define HAS_ENDGRENT_R	   /**/
-#define ENDGRENT_R_PROTO REENTRANT_PROTO_I_H	   /**/
+/*#define HAS_ENDGRENT_R	   / **/
+#define ENDGRENT_R_PROTO 0	   /**/
 
 /* HAS_ENDHOSTENT:
  *	This symbol, if defined, indicates that the endhostent() routine is
@@ -1301,8 +1301,8 @@
 /* ENDPWENT_R_PROTO:
  *	This symbol encodes the prototype of endpwent_r.
  */
-#define HAS_ENDPWENT_R	   /**/
-#define ENDPWENT_R_PROTO REENTRANT_PROTO_I_H	   /**/
+/*#define HAS_ENDPWENT_R	   / **/
+#define ENDPWENT_R_PROTO 0	   /**/
 
 /* HAS_ENDSERVENT:
  *	This symbol, if defined, indicates that the endservent() routine is
@@ -1489,8 +1489,8 @@
 /* GETGRENT_R_PROTO:
  *	This symbol encodes the prototype of getgrent_r.
  */
-#define HAS_GETGRENT_R	   /**/
-#define GETGRENT_R_PROTO REENTRANT_PROTO_I_SBWR	   /**/
+/*#define HAS_GETGRENT_R	   / **/
+#define GETGRENT_R_PROTO 0	   /**/
 
 /* HAS_GETGRGID_R:
  *	This symbol, if defined, indicates that the getgrgid_r routine
@@ -1499,8 +1499,8 @@
 /* GETGRGID_R_PROTO:
  *	This symbol encodes the prototype of getgrgid_r.
  */
-#define HAS_GETGRGID_R	   /**/
-#define GETGRGID_R_PROTO REENTRANT_PROTO_I_TSBWR	   /**/
+/*#define HAS_GETGRGID_R	   / **/
+#define GETGRGID_R_PROTO 0	   /**/
 
 /* HAS_GETGRNAM_R:
  *	This symbol, if defined, indicates that the getgrnam_r routine
@@ -1509,8 +1509,8 @@
 /* GETGRNAM_R_PROTO:
  *	This symbol encodes the prototype of getgrnam_r.
  */
-#define HAS_GETGRNAM_R	   /**/
-#define GETGRNAM_R_PROTO REENTRANT_PROTO_I_CSBWR	   /**/
+/*#define HAS_GETGRNAM_R	   / **/
+#define GETGRNAM_R_PROTO 0	   /**/
 
 /* HAS_GETHOSTBYADDR:
  *	This symbol, if defined, indicates that the gethostbyaddr() routine is
@@ -1580,8 +1580,8 @@
 /* GETLOGIN_R_PROTO:
  *	This symbol encodes the prototype of getlogin_r.
  */
-#define HAS_GETLOGIN_R	   /**/
-#define GETLOGIN_R_PROTO REENTRANT_PROTO_I_BW	   /**/
+/*#define HAS_GETLOGIN_R	   / **/
+#define GETLOGIN_R_PROTO 0	   /**/
 
 /* HAS_GETMNT:
  *	This symbol, if defined, indicates that the getmnt routine is
@@ -1684,8 +1684,8 @@
 /* GETPWENT_R_PROTO:
  *	This symbol encodes the prototype of getpwent_r.
  */
-#define HAS_GETPWENT_R	   /**/
-#define GETPWENT_R_PROTO REENTRANT_PROTO_I_SBWR	   /**/
+/*#define HAS_GETPWENT_R	   / **/
+#define GETPWENT_R_PROTO 0	   /**/
 
 /* HAS_GETPWNAM_R:
  *	This symbol, if defined, indicates that the getpwnam_r routine
@@ -1694,8 +1694,8 @@
 /* GETPWNAM_R_PROTO:
  *	This symbol encodes the prototype of getpwnam_r.
  */
-#define HAS_GETPWNAM_R	   /**/
-#define GETPWNAM_R_PROTO REENTRANT_PROTO_I_CSBWR	   /**/
+/*#define HAS_GETPWNAM_R	   / **/
+#define GETPWNAM_R_PROTO 0	   /**/
 
 /* HAS_GETPWUID_R:
  *	This symbol, if defined, indicates that the getpwuid_r routine
@@ -1704,8 +1704,8 @@
 /* GETPWUID_R_PROTO:
  *	This symbol encodes the prototype of getpwuid_r.
  */
-#define HAS_GETPWUID_R	   /**/
-#define GETPWUID_R_PROTO REENTRANT_PROTO_I_TSBWR	   /**/
+/*#define HAS_GETPWUID_R	   / **/
+#define GETPWUID_R_PROTO 0	   /**/
 
 /* HAS_GETSERVENT:
  *	This symbol, if defined, indicates that the getservent() routine is
@@ -1755,8 +1755,8 @@
 /* GMTIME_R_PROTO:
  *	This symbol encodes the prototype of gmtime_r.
  */
-#define HAS_GMTIME_R	   /**/
-#define GMTIME_R_PROTO REENTRANT_PROTO_S_TS	   /**/
+/*#define HAS_GMTIME_R	   / **/
+#define GMTIME_R_PROTO 0	   /**/
 
 /* HAS_GNULIBC:
  *	This symbol, if defined, indicates to the C program that 
@@ -1856,8 +1856,8 @@
 /* LOCALTIME_R_PROTO:
  *	This symbol encodes the prototype of localtime_r.
  */
-#define HAS_LOCALTIME_R	   /**/
-#define LOCALTIME_R_PROTO REENTRANT_PROTO_S_TS	   /**/
+/*#define HAS_LOCALTIME_R	   / **/
+#define LOCALTIME_R_PROTO 0	   /**/
 
 /* HAS_LONG_DOUBLE:
  *	This symbol will be defined if the C compiler supports long
@@ -2018,8 +2018,8 @@
 /* RANDOM_R_PROTO:
  *	This symbol encodes the prototype of random_r.
  */
-#define HAS_RANDOM_R	   /**/
-#define RANDOM_R_PROTO REENTRANT_PROTO_I_TS	   /**/
+/*#define HAS_RANDOM_R	   / **/
+#define RANDOM_R_PROTO 0	   /**/
 
 /* HAS_READDIR_R:
  *	This symbol, if defined, indicates that the readdir_r routine
@@ -2028,8 +2028,8 @@
 /* READDIR_R_PROTO:
  *	This symbol encodes the prototype of readdir_r.
  */
-#define HAS_READDIR_R	   /**/
-#define READDIR_R_PROTO REENTRANT_PROTO_I_TSR	   /**/
+/*#define HAS_READDIR_R	   / **/
+#define READDIR_R_PROTO 0	   /**/
 
 /* HAS_READV:
  *	This symbol, if defined, indicates that the readv routine is
@@ -2101,8 +2101,8 @@
 /* SETGRENT_R_PROTO:
  *	This symbol encodes the prototype of setgrent_r.
  */
-#define HAS_SETGRENT_R	   /**/
-#define SETGRENT_R_PROTO REENTRANT_PROTO_I_H	   /**/
+/*#define HAS_SETGRENT_R	   / **/
+#define SETGRENT_R_PROTO 0	   /**/
 
 /* HAS_SETGROUPS:
  *	This symbol, if defined, indicates that the setgroups() routine is
@@ -2166,8 +2166,8 @@
 /* SETPWENT_R_PROTO:
  *	This symbol encodes the prototype of setpwent_r.
  */
-#define HAS_SETPWENT_R	   /**/
-#define SETPWENT_R_PROTO REENTRANT_PROTO_I_H	   /**/
+/*#define HAS_SETPWENT_R	   / **/
+#define SETPWENT_R_PROTO 0	   /**/
 
 /* HAS_SETSERVENT:
  *	This symbol, if defined, indicates that the setservent() routine is
@@ -2297,8 +2297,8 @@
 /* SRAND48_R_PROTO:
  *	This symbol encodes the prototype of srand48_r.
  */
-#define HAS_SRAND48_R	   /**/
-#define SRAND48_R_PROTO REENTRANT_PROTO_I_LS	   /**/
+/*#define HAS_SRAND48_R	   / **/
+#define SRAND48_R_PROTO 0	   /**/
 
 /* HAS_SRANDOM_R:
  *	This symbol, if defined, indicates that the srandom_r routine
@@ -2307,8 +2307,8 @@
 /* SRANDOM_R_PROTO:
  *	This symbol encodes the prototype of srandom_r.
  */
-#define HAS_SRANDOM_R	   /**/
-#define SRANDOM_R_PROTO REENTRANT_PROTO_I_TS	   /**/
+/*#define HAS_SRANDOM_R	   / **/
+#define SRANDOM_R_PROTO 0	   /**/
 
 /* USE_STAT_BLOCKS:
  *	This symbol is defined if this system has a stat structure declaring
@@ -2437,8 +2437,8 @@
 /* STRERROR_R_PROTO:
  *	This symbol encodes the prototype of strerror_r.
  */
-#define HAS_STRERROR_R	   /**/
-#define STRERROR_R_PROTO REENTRANT_PROTO_I_IBW	   /**/
+/*#define HAS_STRERROR_R	   / **/
+#define STRERROR_R_PROTO 0	   /**/
 
 /* HAS_STRTOLD:
  *	This symbol, if defined, indicates that the strtold routine is
@@ -2484,11 +2484,15 @@
  */
 #define	HAS_TELLDIR_PROTO	/**/
 
+/* HAS_TIME:
+ *	This symbol, if defined, indicates that the time() routine exists.
+ */
 /* Time_t:
  *	This symbol holds the type returned by time(). It can be long,
  *	or time_t on BSD sites (in which case <sys/types.h> should be
  *	included).
  */
+#define HAS_TIME		/**/
 #define Time_t time_t		/* Time type */
 
 /* HAS_TIMES:
@@ -3863,8 +3867,8 @@
 /* ENDHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of endhostent_r.
  */
-#define HAS_ENDHOSTENT_R	   /**/
-#define ENDHOSTENT_R_PROTO REENTRANT_PROTO_I_S	   /**/
+/*#define HAS_ENDHOSTENT_R	   / **/
+#define ENDHOSTENT_R_PROTO 0	   /**/
 
 /* HAS_ENDNETENT_R:
  *	This symbol, if defined, indicates that the endnetent_r routine
@@ -3873,8 +3877,8 @@
 /* ENDNETENT_R_PROTO:
  *	This symbol encodes the prototype of endnetent_r.
  */
-#define HAS_ENDNETENT_R	   /**/
-#define ENDNETENT_R_PROTO REENTRANT_PROTO_I_S	   /**/
+/*#define HAS_ENDNETENT_R	   / **/
+#define ENDNETENT_R_PROTO 0	   /**/
 
 /* HAS_ENDPROTOENT_R:
  *	This symbol, if defined, indicates that the endprotoent_r routine
@@ -3883,8 +3887,8 @@
 /* ENDPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of endprotoent_r.
  */
-#define HAS_ENDPROTOENT_R	   /**/
-#define ENDPROTOENT_R_PROTO REENTRANT_PROTO_I_S	   /**/
+/*#define HAS_ENDPROTOENT_R	   / **/
+#define ENDPROTOENT_R_PROTO 0	   /**/
 
 /* HAS_ENDSERVENT_R:
  *	This symbol, if defined, indicates that the endservent_r routine
@@ -3893,8 +3897,8 @@
 /* ENDSERVENT_R_PROTO:
  *	This symbol encodes the prototype of endservent_r.
  */
-#define HAS_ENDSERVENT_R	   /**/
-#define ENDSERVENT_R_PROTO REENTRANT_PROTO_I_S	   /**/
+/*#define HAS_ENDSERVENT_R	   / **/
+#define ENDSERVENT_R_PROTO 0	   /**/
 
 /* HAS_GETHOSTBYADDR_R:
  *	This symbol, if defined, indicates that the gethostbyaddr_r routine
@@ -3903,8 +3907,8 @@
 /* GETHOSTBYADDR_R_PROTO:
  *	This symbol encodes the prototype of gethostbyaddr_r.
  */
-#define HAS_GETHOSTBYADDR_R	   /**/
-#define GETHOSTBYADDR_R_PROTO REENTRANT_PROTO_I_CWISBWRE	   /**/
+/*#define HAS_GETHOSTBYADDR_R	   / **/
+#define GETHOSTBYADDR_R_PROTO 0	   /**/
 
 /* HAS_GETHOSTBYNAME_R:
  *	This symbol, if defined, indicates that the gethostbyname_r routine
@@ -3913,8 +3917,8 @@
 /* GETHOSTBYNAME_R_PROTO:
  *	This symbol encodes the prototype of gethostbyname_r.
  */
-#define HAS_GETHOSTBYNAME_R	   /**/
-#define GETHOSTBYNAME_R_PROTO REENTRANT_PROTO_I_CSBWRE	   /**/
+/*#define HAS_GETHOSTBYNAME_R	   / **/
+#define GETHOSTBYNAME_R_PROTO 0	   /**/
 
 /* HAS_GETHOSTENT_R:
  *	This symbol, if defined, indicates that the gethostent_r routine
@@ -3923,8 +3927,8 @@
 /* GETHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of gethostent_r.
  */
-#define HAS_GETHOSTENT_R	   /**/
-#define GETHOSTENT_R_PROTO REENTRANT_PROTO_I_SBWRE	   /**/
+/*#define HAS_GETHOSTENT_R	   / **/
+#define GETHOSTENT_R_PROTO 0	   /**/
 
 /* HAS_GETNETBYADDR_R:
  *	This symbol, if defined, indicates that the getnetbyaddr_r routine
@@ -3933,8 +3937,8 @@
 /* GETNETBYADDR_R_PROTO:
  *	This symbol encodes the prototype of getnetbyaddr_r.
  */
-#define HAS_GETNETBYADDR_R	   /**/
-#define GETNETBYADDR_R_PROTO REENTRANT_PROTO_I_UISBWRE	   /**/
+/*#define HAS_GETNETBYADDR_R	   / **/
+#define GETNETBYADDR_R_PROTO 0	   /**/
 
 /* HAS_GETNETBYNAME_R:
  *	This symbol, if defined, indicates that the getnetbyname_r routine
@@ -3943,8 +3947,8 @@
 /* GETNETBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getnetbyname_r.
  */
-#define HAS_GETNETBYNAME_R	   /**/
-#define GETNETBYNAME_R_PROTO REENTRANT_PROTO_I_CSBWRE	   /**/
+/*#define HAS_GETNETBYNAME_R	   / **/
+#define GETNETBYNAME_R_PROTO 0	   /**/
 
 /* HAS_GETNETENT_R:
  *	This symbol, if defined, indicates that the getnetent_r routine
@@ -3953,8 +3957,8 @@
 /* GETNETENT_R_PROTO:
  *	This symbol encodes the prototype of getnetent_r.
  */
-#define HAS_GETNETENT_R	   /**/
-#define GETNETENT_R_PROTO REENTRANT_PROTO_I_SBWRE	   /**/
+/*#define HAS_GETNETENT_R	   / **/
+#define GETNETENT_R_PROTO 0	   /**/
 
 /* HAS_GETPROTOBYNAME_R:
  *	This symbol, if defined, indicates that the getprotobyname_r routine
@@ -3963,8 +3967,8 @@
 /* GETPROTOBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getprotobyname_r.
  */
-#define HAS_GETPROTOBYNAME_R	   /**/
-#define GETPROTOBYNAME_R_PROTO REENTRANT_PROTO_I_CSBWR	   /**/
+/*#define HAS_GETPROTOBYNAME_R	   / **/
+#define GETPROTOBYNAME_R_PROTO 0	   /**/
 
 /* HAS_GETPROTOBYNUMBER_R:
  *	This symbol, if defined, indicates that the getprotobynumber_r routine
@@ -3973,8 +3977,8 @@
 /* GETPROTOBYNUMBER_R_PROTO:
  *	This symbol encodes the prototype of getprotobynumber_r.
  */
-#define HAS_GETPROTOBYNUMBER_R	   /**/
-#define GETPROTOBYNUMBER_R_PROTO REENTRANT_PROTO_I_ISBWR	   /**/
+/*#define HAS_GETPROTOBYNUMBER_R	   / **/
+#define GETPROTOBYNUMBER_R_PROTO 0	   /**/
 
 /* HAS_GETPROTOENT_R:
  *	This symbol, if defined, indicates that the getprotoent_r routine
@@ -3983,8 +3987,8 @@
 /* GETPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of getprotoent_r.
  */
-#define HAS_GETPROTOENT_R	   /**/
-#define GETPROTOENT_R_PROTO REENTRANT_PROTO_I_SBWR	   /**/
+/*#define HAS_GETPROTOENT_R	   / **/
+#define GETPROTOENT_R_PROTO 0	   /**/
 
 /* HAS_GETSERVBYNAME_R:
  *	This symbol, if defined, indicates that the getservbyname_r routine
@@ -3993,8 +3997,8 @@
 /* GETSERVBYNAME_R_PROTO:
  *	This symbol encodes the prototype of getservbyname_r.
  */
-#define HAS_GETSERVBYNAME_R	   /**/
-#define GETSERVBYNAME_R_PROTO REENTRANT_PROTO_I_CCSBWR	   /**/
+/*#define HAS_GETSERVBYNAME_R	   / **/
+#define GETSERVBYNAME_R_PROTO 0	   /**/
 
 /* HAS_GETSERVBYPORT_R:
  *	This symbol, if defined, indicates that the getservbyport_r routine
@@ -4003,8 +4007,8 @@
 /* GETSERVBYPORT_R_PROTO:
  *	This symbol encodes the prototype of getservbyport_r.
  */
-#define HAS_GETSERVBYPORT_R	   /**/
-#define GETSERVBYPORT_R_PROTO REENTRANT_PROTO_I_ICSBWR	   /**/
+/*#define HAS_GETSERVBYPORT_R	   / **/
+#define GETSERVBYPORT_R_PROTO 0	   /**/
 
 /* HAS_GETSERVENT_R:
  *	This symbol, if defined, indicates that the getservent_r routine
@@ -4013,8 +4017,8 @@
 /* GETSERVENT_R_PROTO:
  *	This symbol encodes the prototype of getservent_r.
  */
-#define HAS_GETSERVENT_R	   /**/
-#define GETSERVENT_R_PROTO REENTRANT_PROTO_I_SBWR	   /**/
+/*#define HAS_GETSERVENT_R	   / **/
+#define GETSERVENT_R_PROTO 0	   /**/
 
 /* HAS_PTHREAD_ATFORK:
  *	This symbol, if defined, indicates that the pthread_atfork routine
@@ -4039,8 +4043,8 @@
 /* SETHOSTENT_R_PROTO:
  *	This symbol encodes the prototype of sethostent_r.
  */
-#define HAS_SETHOSTENT_R	   /**/
-#define SETHOSTENT_R_PROTO REENTRANT_PROTO_I_ID	   /**/
+/*#define HAS_SETHOSTENT_R	   / **/
+#define SETHOSTENT_R_PROTO 0	   /**/
 
 /* HAS_SETLOCALE_R:
  *	This symbol, if defined, indicates that the setlocale_r routine
@@ -4059,8 +4063,8 @@
 /* SETNETENT_R_PROTO:
  *	This symbol encodes the prototype of setnetent_r.
  */
-#define HAS_SETNETENT_R	   /**/
-#define SETNETENT_R_PROTO REENTRANT_PROTO_I_ID	   /**/
+/*#define HAS_SETNETENT_R	   / **/
+#define SETNETENT_R_PROTO 0	   /**/
 
 /* HAS_SETPROTOENT_R:
  *	This symbol, if defined, indicates that the setprotoent_r routine
@@ -4069,8 +4073,8 @@
 /* SETPROTOENT_R_PROTO:
  *	This symbol encodes the prototype of setprotoent_r.
  */
-#define HAS_SETPROTOENT_R	   /**/
-#define SETPROTOENT_R_PROTO REENTRANT_PROTO_I_ID	   /**/
+/*#define HAS_SETPROTOENT_R	   / **/
+#define SETPROTOENT_R_PROTO 0	   /**/
 
 /* HAS_SETSERVENT_R:
  *	This symbol, if defined, indicates that the setservent_r routine
@@ -4079,8 +4083,8 @@
 /* SETSERVENT_R_PROTO:
  *	This symbol encodes the prototype of setservent_r.
  */
-#define HAS_SETSERVENT_R	   /**/
-#define SETSERVENT_R_PROTO REENTRANT_PROTO_I_ID	   /**/
+/*#define HAS_SETSERVENT_R	   / **/
+#define SETSERVENT_R_PROTO 0	   /**/
 
 /* HAS_TTYNAME_R:
  *	This symbol, if defined, indicates that the ttyname_r routine
@@ -4089,7 +4093,7 @@
 /* TTYNAME_R_PROTO:
  *	This symbol encodes the prototype of ttyname_r.
  */
-#define HAS_TTYNAME_R	   /**/
-#define TTYNAME_R_PROTO REENTRANT_PROTO_I_IBW	   /**/
+/*#define HAS_TTYNAME_R	   / **/
+#define TTYNAME_R_PROTO 0	   /**/
 
 #endif