Add a --regen option to checkcfgvar.pl to regenerate config files.

Verify that the section of config file containing probed files is sorted
lexically. If --regen is used, updated the file on disk with a correctly
sorted version. (Except for configure.com, which has a different structure
not amenable to automatic analysis and update, hence still has to be
updated manually.)

Ensure all config files are correctly sorted.

15 files changed, 308 insertions, 272 deletions

diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 3a21d0818e..928efa709c 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -89,6 +89,20 @@ csh='csh'
 ctermid_r_proto='0'
 ctime_r_proto='0'
 d_Gconvert='gcvt((x),(n),(b))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
 d_access='define'
 d_accessx='undef'
 d_aintl='undef'
@@ -108,9 +122,9 @@ d_attribute_unused='undef'
 d_attribute_warn_unused_result='undef'
 d_bcmp='define'
 d_bcopy='define'
+d_bsd='undef'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='undef'
-d_bsd='undef'
 d_builtin_choose_expr='define'
 d_builtin_expect='define'
 d_bzero='define'
@@ -131,8 +145,8 @@ d_cplusplus='undef'
 d_crypt='define'
 d_crypt_r='undef'
 d_csh='define'
-d_ctermid_r='undef'
 d_ctermid='undef'
+d_ctermid_r='undef'
 d_ctime64='undef'
 d_ctime_r='undef'
 d_cuserid='define'
@@ -147,8 +161,8 @@ d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
 d_dosuid='undef'
-d_drand48proto='define'
 d_drand48_r='undef'
+d_drand48proto='define'
 d_dup2='define'
 d_eaccess='undef'
 d_endgrent='define'
@@ -169,11 +183,11 @@ d_faststdio='define'
 d_fchdir='define'
 d_fchmod='define'
 d_fchown='define'
-d_fcntl_can_lock='define'
 d_fcntl='define'
+d_fcntl_can_lock='define'
 d_fd_macros='define'
-d_fds_bits='undef'
 d_fd_set='define'
+d_fds_bits='undef'
 d_fgetpos='define'
 d_finite='define'
 d_finitel='define'
@@ -181,11 +195,11 @@ d_flexfnam='define'
 d_flock='define'
 d_flockproto='define'
 d_fork='define'
+d_fp_class='undef'
 d_fpathconf='define'
+d_fpclass='undef'
 d_fpclassify='undef'
 d_fpclassl='undef'
-d_fp_class='undef'
-d_fpclass='undef'
 d_fpos64_t='undef'
 d_frexpl='define'
 d_fs_data_s='undef'
@@ -197,11 +211,10 @@ d_fsync='define'
 d_ftello='define'
 d_ftime='undef'
 d_futimes='undef'
-d__fwalk='undef'
 d_gdbm_ndbm_h_uses_prototypes='undef'
 d_gdbmndbm_h_uses_prototypes='undef'
-d_getcwd='define'
 d_getaddrinfo='undef'
+d_getcwd='define'
 d_getespwnam='undef'
 d_getfsstat='undef'
 d_getgrent='define'
@@ -220,8 +233,8 @@ d_gethostprotos='define'
 d_getitimer='define'
 d_getlogin='define'
 d_getlogin_r='undef'
-d_getmntent='define'
 d_getmnt='undef'
+d_getmntent='define'
 d_getnameinfo='undef'
 d_getnbyaddr='define'
 d_getnbyname='define'
@@ -282,8 +295,8 @@ d_ldbl_dig='define'
 d_libm_lib_version='define'
 d_link='define'
 d_localtime64='undef'
-d_localtime_r_needs_tzset='undef'
 d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
 d_locconv='define'
 d_lockf='define'
 d_longdbl='define'
@@ -313,27 +326,14 @@ d_modfl='define'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
 d_mprotect='define'
-d_msgctl='define'
-d_msg_ctrunc='define'
 d_msg='define'
+d_msg_ctrunc='define'
 d_msg_dontroute='define'
-d_msgget='define'
 d_msg_oob='define'
 d_msg_peek='define'
 d_msg_proxy='define'
-d_PRId64='define'
-d_PRIeldbl='define'
-d_PRIEUldbl='define'
-d_PRIfldbl='define'
-d_PRIFUldbl='define'
-d_PRIgldbl='define'
-d_PRIGUldbl='define'
-d_PRIi64='define'
-d_PRIo64='define'
-d_PRIu64='define'
-d_PRIx64='define'
-d_PRIXU64='define'
-d_SCNfldbl='define'
+d_msgctl='define'
+d_msgget='define'
 d_msghdr_s='define'
 d_msgrcv='define'
 d_msgsnd='define'
@@ -833,8 +833,8 @@ nroff='nroff'
 nvEUformat='"E"'
 nvFUformat='"F"'
 nvGUformat='"G"'
-nv_preserves_uv_bits='32'
 nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='32'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
@@ -892,18 +892,18 @@ sGMTIME_max='2147483647'
 sGMTIME_min='0'
 sLOCALTIME_max='2147483647'
 sLOCALTIME_min='0'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"LX"'
 sPRId64='"Ld"'
 sPRIeldbl='"e"'
-sPRIEUldbl='"E"'
 sPRIfldbl='"f"'
-sPRIFUldbl='"F"'
 sPRIgldbl='"g"'
-sPRIGUldbl='"G"'
 sPRIi64='"Li"'
 sPRIo64='"Lo"'
 sPRIu64='"Lu"'
 sPRIx64='"Lx"'
-sPRIXU64='"LX"'
 sSCNfldbl='"f"'
 sched_yield='sched_yield()'
 scriptdir='/usr/bin'
@@ -968,6 +968,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src='.'
 ssizetype='ssize_t'
+st_ino_sign='1'
+st_ino_size='4'
 startperl='#!/usr/bin/perl'
 startsh='#!/bin/sh'
 static_ext=' '
@@ -978,8 +980,6 @@ stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_IO_read_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='4'
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
diff --git a/NetWare/config.wc b/NetWare/config.wc
index 71b398d90c..419aa83ea4 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -129,11 +129,11 @@ d_cmsghdr_s='undef'
 d_const='define'
 d_copysignl='undef'
 d_cplusplus='undef'
-d_crypt_r='undef'
 d_crypt='undef'
+d_crypt_r='undef'
 d_csh='undef'
-d_ctermid_r='undef'
 d_ctermid='undef'
+d_ctermid_r='undef'
 d_ctime64='undef'
 d_ctime_r='undef'
 d_cuserid='undef'
@@ -148,20 +148,20 @@ d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
 d_dosuid='undef'
-d_drand48proto='undef'
 d_drand48_r='undef'
+d_drand48proto='undef'
 d_dup2='define'
 d_eaccess='undef'
-d_endgrent_r='undef'
 d_endgrent='undef'
+d_endgrent_r='undef'
 d_endhent='undef'
 d_endhostent_r='undef'
 d_endnent='undef'
 d_endnetent_r='undef'
 d_endpent='undef'
 d_endprotoent_r='undef'
-d_endpwent_r='undef'
 d_endpwent='undef'
+d_endpwent_r='undef'
 d_endsent='undef'
 d_endservent_r='undef'
 d_endspent='undef'
@@ -171,23 +171,23 @@ d_faststdio='undef'
 d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='undef'
+d_fcntl_can_lock='undef'
 d_fd_macros='define'
-d_fds_bits='define'
 d_fd_set='define'
+d_fds_bits='define'
 d_fgetpos='define'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='define'
 d_flock='define'
 d_flockproto='undef'
 d_fork='undef'
+d_fp_class='undef'
 d_fpathconf='undef'
+d_fpclass='undef'
 d_fpclassify='undef'
 d_fpclassl='undef'
-d_fp_class='undef'
-d_fpclass='undef'
 d_fpos64_t='undef'
 d_frexpl='undef'
 d_fs_data_s='undef'
@@ -205,8 +205,8 @@ d_getaddrinfo='undef'
 d_getcwd='define'
 d_getespwnam='undef'
 d_getfsstat='undef'
-d_getgrent_r='undef'
 d_getgrent='undef'
+d_getgrent_r='undef'
 d_getgrgid_r='undef'
 d_getgrnam_r='undef'
 d_getgrps='undef'
@@ -221,8 +221,8 @@ d_gethostprotos='define'
 d_getitimer='undef'
 d_getlogin='define'
 d_getlogin_r='undef'
-d_getmntent='undef'
 d_getmnt='undef'
+d_getmntent='undef'
 d_getnameinfo='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
@@ -245,8 +245,8 @@ d_getprotobynumber_r='undef'
 d_getprotoent_r='undef'
 d_getprotoprotos='define'
 d_getprpwnam='undef'
-d_getpwent_r='undef'
 d_getpwent='undef'
+d_getpwent_r='undef'
 d_getpwnam_r='undef'
 d_getpwuid_r='undef'
 d_getsbyname='define'
@@ -257,8 +257,8 @@ d_getservbyport_r='undef'
 d_getservent_r='undef'
 d_getservprotos='define'
 d_getspent='undef'
-d_getspnam_r='undef'
 d_getspnam='undef'
+d_getspnam_r='undef'
 d_gettimeod='undef'
 d_gmtime64='undef'
 d_gmtime_r='undef'
@@ -276,16 +276,16 @@ d_int64_t='undef'
 d_isascii='define'
 d_isfinite='undef'
 d_isinf='undef'
-d_isnanl='undef'
 d_isnan='undef'
+d_isnanl='undef'
 d_killpg='undef'
 d_lchown='undef'
 d_ldbl_dig='define'
 d_libm_lib_version='undef'
 d_link='define'
 d_localtime64='undef'
-d_localtime_r_needs_tzset='undef'
 d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
 d_locconv='define'
 d_lockf='undef'
 d_longdbl='define'
@@ -306,26 +306,26 @@ d_memset='define'
 d_mkdir='define'
 d_mkdtemp='undef'
 d_mkfifo='undef'
-d_mkstemps='undef'
 d_mkstemp='undef'
+d_mkstemps='undef'
 d_mktime64='undef'
 d_mktime='define'
 d_mmap='undef'
+d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
-d_modfl='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
@@ -451,9 +451,9 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
-d_static_inline='undef'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
+d_static_inline='undef'
 d_statvfs='undef'
 d_stdio_cnt_lval='undef'
 d_stdio_ptr_lval='undef'
@@ -808,8 +808,8 @@ nroff=''
 nvEUformat='"E"'
 nvFUformat='"F"'
 nvGUformat='"G"'
-nv_preserves_uv_bits='32'
 nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='32'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
@@ -830,9 +830,9 @@ patchlevel='~PATCHLEVEL~'
 path_sep=';'
 perl5=''
 perl='perl'
+perl_static_inline='static'
 perladmin=''
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.nlm'
-perl_static_inline='static'
 pg=''
 phostname='hostname'
 pidtype='int'
@@ -932,6 +932,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src=''
 ssizetype='int'
+st_ino_sign='1'
+st_ino_size='4'
 startperl='#!perl'
 startsh='#!/bin/sh'
 static_ext='DynaLoader'
@@ -942,8 +944,6 @@ stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='4'
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
diff --git a/Porting/checkcfgvar.pl b/Porting/checkcfgvar.pl
index ae1af6bc03..00967f223f 100755
--- a/Porting/checkcfgvar.pl
+++ b/Porting/checkcfgvar.pl
@@ -16,18 +16,25 @@ use autodie;
 sub usage
 {
     my $err = shift and select STDERR;
-    print "usage: $0 [--list]\n";
+    print "usage: $0 [--list] [--regen]\n";
     exit $err;
     } # usage
 
 use Getopt::Long;
 my $opt_l = 0;
+my $opt_r = 0;
 GetOptions (
     "help|?"	=> sub { usage (0); },
     "l|list!"	=> \$opt_l,
+    "regen"	=> \$opt_r,
     ) or usage (1);
 
+require 'regen/regen_lib.pl' if $opt_r;
+
 my $MASTER_CFG = "config_h.SH";
+# Inclusive bounds on the main part of the file, $section == 1 below:
+my $first = qr/^Author=/;
+my $last = qr/^zip=/;
 
 my @CFG = (
 	   # we check from MANIFEST whether they are expected to be present.
@@ -81,6 +88,8 @@ for my $cfg (sort @CFG) {
 	next;
     }
     my %cfg;
+    my $section = 0;
+    my @lines;
 
     open my $fh, '<', $cfg;
 
@@ -94,7 +103,16 @@ for my $cfg (sort @CFG) {
 	}
     } else {
 	while (<$fh>) {
+	    if ($_ =~ $first) {
+		die "$cfg:$.:section=$section:$_" unless $section == 0;
+		$section = 1;
+	    }
+	    push @{$lines[$section]}, $_;
 	    next if /^\#/ || /^\s*$/ || /^\:/;
+	    if ($_ =~ $last) {
+		die "$cfg:$.:section=$section:$_" unless $section == 1;
+		$section = 2;
+	    }
 	    # foo='bar'
 	    # foo=bar
 	    # (optionally with a trailing comment)
@@ -108,6 +126,19 @@ for my $cfg (sort @CFG) {
     close $fh;
 
     my $problems;
+    if ($cfg ne 'configure.com') {
+	if (join("", @{$lines[1]}) ne join("", sort @{$lines[1]})) {
+	    ++$problems;
+	    if ($opt_r) {
+		@{$lines[1]} = sort @{$lines[1]};
+	    } elsif ($opt_l) {
+		print "$cfg\n";
+	    }
+	    else {
+		print "$cfg: unsorted\n";
+	    }
+	}
+    }
     for my $v (@MASTER_CFG) {
 	exists $cfg{$v} and next;
 	if ($opt_l) {
@@ -118,4 +149,9 @@ for my $cfg (sort @CFG) {
 	    print "$cfg: missing '$v'\n";
 	}
     }
+    if ($problems && $opt_r) {
+	my $fh = open_new($cfg);
+	print $fh @{$_} foreach @lines;
+	close_and_rename($fh);
+    }
 }
diff --git a/Porting/config.sh b/Porting/config.sh
index 076a4bfa41..2c7c2aa8ac 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -990,6 +990,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src='.'
 ssizetype='ssize_t'
+st_ino_sign='1'
+st_ino_size='4'
 startperl='#!/opt/perl/bin/perl5.15.3'
 startsh='#!/bin/sh'
 static_ext=' '
@@ -1000,8 +1002,6 @@ stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_IO_read_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='4'
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index fc8400aa91..2f7e938115 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -122,9 +122,9 @@ d_attribute_unused='undef'
 d_attribute_warn_unused_result='undef'
 d_bcmp='define'
 d_bcopy='define'
+d_bsd='undef'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='undef'
-d_bsd='undef'
 d_builtin_choose_expr='undef'
 d_builtin_expect='undef'
 d_bzero='define'
@@ -142,11 +142,11 @@ d_cmsghdr_s='undef'
 d_const='define'
 d_copysignl='undef'
 d_cplusplus='undef'
-d_crypt_r='undef'
 d_crypt='undef'
+d_crypt_r='undef'
 d_csh='undef'
-d_ctermid_r='undef'
 d_ctermid='undef'
+d_ctermid_r='undef'
 d_ctime64='undef'
 d_ctime_r='undef'
 d_cuserid='define'
@@ -161,8 +161,8 @@ d_dlerror='undef'
 d_dlopen='undef'
 d_dlsymun='undef'
 d_dosuid='undef'
-d_drand48proto='undef'
 d_drand48_r='undef'
+d_drand48proto='undef'
 d_dup2='define'
 d_eaccess='undef'
 d_endgrent='define'
@@ -183,23 +183,23 @@ d_faststdio='undef'
 d_fchdir='undef'
 d_fchmod='define'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='define'
+d_fcntl_can_lock='undef'
 d_fd_macros='undef'
-d_fds_bits='undef'
 d_fd_set='undef'
+d_fds_bits='undef'
 d_fgetpos='define'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='define'
-d_flockproto='undef'
 d_flock='undef'
+d_flockproto='undef'
 d_fork='define'
+d_fp_class='undef'
 d_fpathconf='define'
+d_fpclass='undef'
 d_fpclassify='undef'
 d_fpclassl='undef'
-d_fp_class='undef'
-d_fpclass='undef'
 d_fpos64_t='undef'
 d_frexpl='undef'
 d_fs_data_s='undef'
@@ -233,8 +233,8 @@ d_gethostprotos='undef'
 d_getitimer='undef'
 d_getlogin='define'
 d_getlogin_r='undef'
-d_getmntent='undef'
 d_getmnt='undef'
+d_getmntent='undef'
 d_getnameinfo='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
@@ -268,8 +268,8 @@ d_getservbyname_r='undef'
 d_getservbyport_r='undef'
 d_getservent_r='undef'
 d_getservprotos='undef'
-d_getspnam_r='undef'
 d_getspnam='undef'
+d_getspnam_r='undef'
 d_gettimeod='define'
 d_gmtime64='undef'
 d_gmtime_r='undef'
@@ -287,16 +287,16 @@ d_int64_t='define'
 d_isascii='undef'
 d_isfinite='undef'
 d_isinf='undef'
-d_isnanl='undef'
 d_isnan='undef'
+d_isnanl='undef'
 d_killpg='undef'
 d_lchown='undef'
 d_ldbl_dig='define'
 d_libm_lib_version='0'
 d_link='define'
 d_localtime64='undef'
-d_localtime_r_needs_tzset='undef'
 d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
 d_locconv='define'
 d_lockf='undef'
 d_longdbl='define'
@@ -317,26 +317,26 @@ d_memset='define'
 d_mkdir='define'
 d_mkdtemp='undef'
 d_mkfifo='define'
-d_mkstemps='undef'
 d_mkstemp='undef'
+d_mkstemps='undef'
 d_mktime64='undef'
 d_mktime='define'
 d_mmap='undef'
+d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
-d_modfl='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='define'
@@ -814,8 +814,8 @@ nroff='nroff'
 nvEUformat='"E"'
 nvFUformat='"F"'
 nvGUformat='"G"'
-nv_preserves_uv_bits='31'
 nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='31'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
@@ -939,6 +939,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src='.'
 ssizetype='ssize_t'
+st_ino_sign='1'
+st_ino_size='4'
 startperl='#!/bin/perl'
 startsh='#!/bin/sh'
 static_ext='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call IO List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Collate Unicode/Normalize attributes re threads threads/shared Encode/Byte Encode/CN Encode/EBCDIC Encode/JP Encode/KR Encode/Symbol Encode/TW Encode/Unicode'
@@ -949,8 +951,6 @@ stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='4'
 strerror_r_proto='0'
 strings='/sys/include/ape/string.h'
 submit=''
diff --git a/symbian/config.sh b/symbian/config.sh
index e0115d09d4..6a27ff5064 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -5,16 +5,16 @@ _o='.o'
 afs='false'
 afsroot='/afs'
 alignbytes='4'
-apiversion='5.005'
 aphostname='localhost'
+apiversion='5.005'
 ar=':'
 archlib='\\system\\libs\\perl\\x.y.z\\thumb-symbian'
 archlibexp='\\system\\libs\\perl\\x.y.z\\thumb-symbian'
 archname='thumb-symbian'
 asctime_r_proto='0'
 bin='\\system\\apps\\perl'
-binexp='\\system\\apps\\perl'
 bincompat5005='n'
+binexp='\\system\\apps\\perl'
 byteorder='1234'
 castflags='0'
 cc='gcc'
@@ -46,6 +46,7 @@ d_PRIo64='undef'
 d_PRIu64='undef'
 d_PRIx64='undef'
 d_SCNfldbl='undef'
+d__fwalk='undef'
 d_access='undef'
 d_accessx='undef'
 d_aintl='undef'
@@ -65,9 +66,9 @@ d_attribute_unused='undef'
 d_attribute_warn_unused_result='undef'
 d_bcmp='undef'
 d_bcopy='undef'
+d_bsd='undef'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='undef'
-d_bsd='undef'
 d_builtin_choose_expr='undef'
 d_builtin_expect='undef'
 d_bzero='undef'
@@ -85,11 +86,11 @@ d_cmsghdr_s='undef'
 d_const='define'
 d_copysignl='undef'
 d_cplusplus='undef'
-d_crypt_r='undef'
 d_crypt='undef'
+d_crypt_r='undef'
 d_csh='undef'
-d_ctermid_r='undef'
 d_ctermid='undef'
+d_ctermid_r='undef'
 d_ctime64='undef'
 d_ctime_r='undef'
 d_cuserid='undef'
@@ -104,20 +105,20 @@ d_dlerror='undef'
 d_dlopen='undef'
 d_dlsymun='undef'
 d_dosuid='undef'
-d_drand48proto='undef'
 d_drand48_r='undef'
+d_drand48proto='undef'
 d_dup2='undef'
 d_eaccess='undef'
-d_endgrent_r='undef'
 d_endgrent='undef'
+d_endgrent_r='undef'
 d_endhent='undef'
 d_endhostent_r='undef'
 d_endnent='undef'
 d_endnetent_r='undef'
 d_endpent='undef'
 d_endprotoent_r='undef'
-d_endpwent_r='undef'
 d_endpwent='undef'
+d_endpwent_r='undef'
 d_endsent='undef'
 d_endservent_r='undef'
 d_eofnblk='undef'
@@ -126,23 +127,23 @@ d_faststdio='undef'
 d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='undef'
+d_fcntl_can_lock='undef'
 d_fd_macros='undef'
-d_fds_bits='undef'
 d_fd_set='undef'
+d_fds_bits='undef'
 d_fgetpos='undef'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='define'
-d_flockproto='undef'
 d_flock='undef'
+d_flockproto='undef'
 d_fork='undef'
+d_fp_class='undef'
 d_fpathconf='undef'
+d_fpclass='undef'
 d_fpclassify='undef'
 d_fpclassl='undef'
-d_fp_class='undef'
-d_fpclass='undef'
 d_fpos64_t='undef'
 d_frexpl='undef'
 d_fs_data_s='undef'
@@ -153,17 +154,16 @@ d_fstatvfs='undef'
 d_fsync='undef'
 d_ftello='undef'
 d_ftime='undef'
-d_futimesat='undef'
 d_futimes='undef'
-d__fwalk='undef'
+d_futimesat='undef'
 d_gdbm_ndbm_h_uses_prototypes='undef'
 d_gdbmndbm_h_uses_prototypes='undef'
 d_getaddrinfo='undef'
 d_getcwd='define'
 d_getespwnam='undef'
 d_getfsstat='undef'
-d_getgrent_r='undef'
 d_getgrent='undef'
+d_getgrent_r='undef'
 d_getgrgid_r='undef'
 d_getgrnam_r='undef'
 d_getgrps='undef'
@@ -176,10 +176,10 @@ d_gethostbyname_r='undef'
 d_gethostent_r='undef'
 d_gethostprotos='define'
 d_getitimer='undef'
-d_getlogin_r='undef'
 d_getlogin='undef'
-d_getmntent='undef'
+d_getlogin_r='undef'
 d_getmnt='undef'
+d_getmntent='undef'
 d_getnameinfo='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
@@ -202,8 +202,8 @@ d_getprotobynumber_r='undef'
 d_getprotoent_r='undef'
 d_getprotoprotos='define'
 d_getprpwnam='undef'
-d_getpwent_r='undef'
 d_getpwent='undef'
+d_getpwent_r='undef'
 d_getpwnam_r='undef'
 d_getpwuid_r='undef'
 d_getsbyname='define'
@@ -214,8 +214,8 @@ d_getservbyport_r='undef'
 d_getservent_r='undef'
 d_getservprotos='define'
 d_getspent='undef'
-d_getspnam_r='undef'
 d_getspnam='undef'
+d_getspnam_r='undef'
 d_gettimeod='define'
 d_gmtime64='undef'
 d_gmtime_r='undef'
@@ -233,16 +233,16 @@ d_int64_t='undef'
 d_isascii='undef'
 d_isfinite='undef'
 d_isinf='undef'
-d_isnanl='undef'
 d_isnan='undef'
+d_isnanl='undef'
 d_killpg='undef'
 d_lchown='undef'
 d_ldbl_dig='undef'
 d_libm_lib_version='undef'
 d_link='undef'
 d_localtime64='undef'
-d_localtime_r_needs_tzset='undef'
 d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
 d_locconv='undef'
 d_lockf='undef'
 d_longdbl='undef'
@@ -263,26 +263,26 @@ d_memset='define'
 d_mkdir='define'
 d_mkdtemp='undef'
 d_mkfifo='undef'
-d_mkstemps='undef'
 d_mkstemp='undef'
+d_mkstemps='undef'
 d_mktime64='undef'
 d_mktime='undef'
 d_mmap='undef'
+d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
-d_modfl='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
@@ -393,6 +393,7 @@ d_sigsetjmp='undef'
 d_sin6_scope_id='undef'
 d_sitearch='define'
 d_sitecustomize='undef'
+d_sitecustomize='undef'
 d_snprintf='undef'
 d_sockaddr_sa_len='undef'
 d_sockatmark='undef'
@@ -409,8 +410,8 @@ d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
 d_statfs_f_flags='undef'
-d_static_inline='undef'
 d_statfs_s='undef'
+d_static_inline='undef'
 d_statvfs='undef'
 d_stdio_cnt_lval='undef'
 d_stdio_ptr_lval='undef'
@@ -465,7 +466,6 @@ d_uname='undef'
 d_union_semun='undef'
 d_unordered='undef'
 d_unsetenv='undef'
-d_sitecustomize='undef'
 d_usleep='define'
 d_usleepproto='undef'
 d_ustat='undef'
@@ -654,10 +654,10 @@ intsize='4'
 ivdformat='"ld"'
 ivsize='4'
 ivtype='long'
-lib_ext='.a'
-lddlflags=''
 ld=':'
+lddlflags=''
 ldflags=''
+lib_ext='.a'
 libc='stdlib'
 libm_lib_version='0'
 libperl='libperl.a'
@@ -683,11 +683,11 @@ netdb_host_type='const char *'
 netdb_name_type='const char *'
 netdb_net_type='unsigned long'
 nroff='nroff'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
 nv_preserves_uv_bits='0'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
 nvsize='8'
 nvtype='double'
 o_nonblock='O_NONBLOCK'
@@ -750,8 +750,8 @@ setnetent_r_proto='0'
 setprotoent_r_proto='0'
 setpwent_r_proto='0'
 setservent_r_proto='0'
-shmattype='void *'
 sh=':'
+shmattype='void *'
 shortsize=2
 sig_name_init='0'
 sig_num_init='0'
@@ -772,6 +772,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src=''
 ssizetype=int
+st_ino_sign='1'
+st_ino_size='4'
 startperl=''
 stdchar=char
 stdio_base='((fp)->_IO_read_base)'
@@ -780,8 +782,6 @@ stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_IO_read_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='4'
 strerror_r_proto='0'
 targetarch='thumb-symbian'
 timetype=time_t
@@ -834,16 +834,16 @@ uvoformat='"lo"'
 uvsize='4'
 uvtype='unsigned long'
 uvuformat='"lu"'
+uvxformat='"lx"'
 vaproto='undef'
-vendorlib_stem=''
-vendorlib=''
-vendorlibexp=''
 vendorarch=''
 vendorarchexp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
 version='x.y.z'
-uvxformat='"lx"'
 versiononly='undef'
 voidflags=1
 xs_apiversion='5.008'
diff --git a/uconfig.h b/uconfig.h
index 9b2867b680..1013423664 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -4705,5 +4705,5 @@
 
 /* Generated from:
  * 5c3a0864433ad4da7f3248b108cf8e17c19bd4d71799cd56b6c2a73bb647561a config_h.SH
- * a6b7197faacd07cbe976969ff7dbafe88df541efb63d49f4bf3307763962172d uconfig.sh
+ * e5d6d7ffdf6717946996c0807aa7a247b46adf41f2d98c62cdd7c1bb8ffe19f2 uconfig.sh
  * ex: set ro: */
diff --git a/uconfig.sh b/uconfig.sh
index 387b2f764c..74a1b9143e 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -18,11 +18,11 @@ cf_by='root@localhost'
 cf_time='Thu Jan  1 00:00:00 GMT 1970'
 charbits='8'
 clocktype='clock_t'
+cpp_stuff='42'
 cpplast='-'
 cppminus='-'
 cpprun='cc -E'
 cppstdin='cc -E'
-cpp_stuff='42'
 crypt_r_proto='0'
 ctermid_r_proto='0'
 ctime_r_proto='0'
@@ -60,9 +60,9 @@ d_attribute_unused='undef'
 d_attribute_warn_unused_result='undef'
 d_bcmp='undef'
 d_bcopy='undef'
+d_bsd='undef'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='undef'
-d_bsd='undef'
 d_builtin_choose_expr='undef'
 d_builtin_expect='undef'
 d_bzero='undef'
@@ -80,11 +80,11 @@ d_cmsghdr_s='undef'
 d_const='undef'
 d_copysignl='undef'
 d_cplusplus='undef'
-d_crypt_r='undef'
 d_crypt='undef'
+d_crypt_r='undef'
 d_csh='undef'
-d_ctermid_r='undef'
 d_ctermid='undef'
+d_ctermid_r='undef'
 d_ctime64='undef'
 d_ctime_r='undef'
 d_cuserid='undef'
@@ -99,20 +99,20 @@ d_dlerror='undef'
 d_dlopen='undef'
 d_dlsymun='undef'
 d_dosuid='undef'
-d_drand48proto='undef'
 d_drand48_r='undef'
+d_drand48proto='undef'
 d_dup2='undef'
 d_eaccess='undef'
-d_endgrent_r='undef'
 d_endgrent='undef'
+d_endgrent_r='undef'
 d_endhent='undef'
 d_endhostent_r='undef'
 d_endnent='undef'
 d_endnetent_r='undef'
 d_endpent='undef'
 d_endprotoent_r='undef'
-d_endpwent_r='undef'
 d_endpwent='undef'
+d_endpwent_r='undef'
 d_endsent='undef'
 d_endservent_r='undef'
 d_eofnblk='undef'
@@ -121,23 +121,23 @@ d_faststdio='undef'
 d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='undef'
+d_fcntl_can_lock='undef'
 d_fd_macros='undef'
-d_fds_bits='undef'
 d_fd_set='undef'
+d_fds_bits='undef'
 d_fgetpos='undef'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='undef'
-d_flockproto='undef'
 d_flock='undef'
+d_flockproto='undef'
 d_fork='define'
+d_fp_class='undef'
 d_fpathconf='undef'
+d_fpclass='undef'
 d_fpclassify='undef'
 d_fpclassl='undef'
-d_fp_class='undef'
-d_fpclass='undef'
 d_fpos64_t='undef'
 d_frexpl='undef'
 d_fs_data_s='undef'
@@ -155,8 +155,8 @@ d_getaddrinfo='undef'
 d_getcwd='undef'
 d_getespwnam='undef'
 d_getfsstat='undef'
-d_getgrent_r='undef'
 d_getgrent='undef'
+d_getgrent_r='undef'
 d_getgrgid_r='undef'
 d_getgrnam_r='undef'
 d_getgrps='undef'
@@ -169,10 +169,10 @@ d_gethostbyname_r='undef'
 d_gethostent_r='undef'
 d_gethostprotos='undef'
 d_getitimer='undef'
-d_getlogin_r='undef'
 d_getlogin='undef'
-d_getmntent='undef'
+d_getlogin_r='undef'
 d_getmnt='undef'
+d_getmntent='undef'
 d_getnameinfo='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
@@ -195,8 +195,8 @@ d_getprotobynumber_r='undef'
 d_getprotoent_r='undef'
 d_getprotoprotos='undef'
 d_getprpwnam='undef'
-d_getpwent_r='undef'
 d_getpwent='undef'
+d_getpwent_r='undef'
 d_getpwnam_r='undef'
 d_getpwuid_r='undef'
 d_getsbyname='undef'
@@ -207,8 +207,8 @@ d_getservbyport_r='undef'
 d_getservent_r='undef'
 d_getservprotos='undef'
 d_getspent='undef'
-d_getspnam_r='undef'
 d_getspnam='undef'
+d_getspnam_r='undef'
 d_gettimeod='undef'
 d_gmtime64='undef'
 d_gmtime_r='undef'
@@ -226,16 +226,16 @@ d_int64_t='undef'
 d_isascii='undef'
 d_isfinite='undef'
 d_isinf='undef'
-d_isnanl='undef'
 d_isnan='undef'
+d_isnanl='undef'
 d_killpg='undef'
 d_lchown='undef'
 d_ldbl_dig='undef'
 d_libm_lib_version='undef'
 d_link='undef'
 d_localtime64='undef'
-d_localtime_r_needs_tzset='undef'
 d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
 d_locconv='undef'
 d_lockf='undef'
 d_longdbl='undef'
@@ -256,26 +256,26 @@ d_memset='define'
 d_mkdir='undef'
 d_mkdtemp='undef'
 d_mkfifo='undef'
-d_mkstemps='undef'
 d_mkstemp='undef'
+d_mkstemps='undef'
 d_mktime64='undef'
 d_mktime='undef'
 d_mmap='undef'
+d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
-d_modfl='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
@@ -289,8 +289,6 @@ d_old_pthread_create_joinable='undef'
 d_oldpthreads='undef'
 d_oldsock='undef'
 d_open3='undef'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-nv_preserves_uv_bits='0'
 d_pathconf='undef'
 d_pause='undef'
 d_perl_otherlibdirs='undef'
@@ -659,6 +657,8 @@ netdb_host_type='const char *'
 netdb_name_type='const char *'
 netdb_net_type='unsigned long'
 nroff='nroff'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='0'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
@@ -694,18 +694,18 @@ sGMTIME_max='2147483647'
 sGMTIME_min='0'
 sLOCALTIME_max='2147483647'
 sLOCALTIME_min='0'
+sPRIEUldbl='"llE"'
+sPRIFUldbl='"llF"'
+sPRIGUldbl='"llG"'
+sPRIXU64='"LX"'
 sPRId64='"Ld"'
 sPRIeldbl='"lle"'
-sPRIEUldbl='"llE"'
 sPRIfldbl='"llf"'
-sPRIFUldbl='"llF"'
 sPRIgldbl='"llg"'
-sPRIGUldbl='"llG"'
 sPRIi64='"Li"'
 sPRIo64='"Lo"'
 sPRIu64='"Lu"'
 sPRIx64='"Lx"'
-sPRIXU64='"LX"'
 sSCNfldbl='"llf"'
 sched_yield='sched_yield()'
 scriptdir='/usr/local/bin'
@@ -739,6 +739,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src='.'
 ssizetype=int
+st_ino_sign='1'
+st_ino_size='4'
 startperl='#!perl'
 stdchar=char
 stdio_base='((fp)->_IO_read_base)'
@@ -747,8 +749,6 @@ stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_IO_read_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='4'
 strerror_r_proto='0'
 targetarch=''
 timetype=time_t
diff --git a/uconfig64.sh b/uconfig64.sh
index a35568a475..784d0f010e 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -19,11 +19,11 @@ cf_by='root@localhost'
 cf_time='Thu Jan  1 00:00:00 GMT 1970'
 charbits='8'
 clocktype='clock_t'
+cpp_stuff='42'
 cpplast='-'
 cppminus='-'
 cpprun='cc -E'
 cppstdin='cc -E'
-cpp_stuff='42'
 crypt_r_proto='0'
 ctermid_r_proto='0'
 ctime_r_proto='0'
@@ -61,9 +61,9 @@ d_attribute_unused='undef'
 d_attribute_warn_unused_result='undef'
 d_bcmp='undef'
 d_bcopy='undef'
+d_bsd='undef'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='undef'
-d_bsd='undef'
 d_builtin_choose_expr='undef'
 d_builtin_expect='undef'
 d_bzero='undef'
@@ -81,11 +81,11 @@ d_cmsghdr_s='undef'
 d_const='undef'
 d_copysignl='undef'
 d_cplusplus='undef'
-d_crypt_r='undef'
 d_crypt='undef'
+d_crypt_r='undef'
 d_csh='undef'
-d_ctermid_r='undef'
 d_ctermid='undef'
+d_ctermid_r='undef'
 d_ctime64='undef'
 d_ctime_r='undef'
 d_cuserid='undef'
@@ -100,20 +100,20 @@ d_dlerror='undef'
 d_dlopen='undef'
 d_dlsymun='undef'
 d_dosuid='undef'
-d_drand48proto='undef'
 d_drand48_r='undef'
+d_drand48proto='undef'
 d_dup2='undef'
 d_eaccess='undef'
-d_endgrent_r='undef'
 d_endgrent='undef'
+d_endgrent_r='undef'
 d_endhent='undef'
 d_endhostent_r='undef'
 d_endnent='undef'
 d_endnetent_r='undef'
 d_endpent='undef'
 d_endprotoent_r='undef'
-d_endpwent_r='undef'
 d_endpwent='undef'
+d_endpwent_r='undef'
 d_endsent='undef'
 d_endservent_r='undef'
 d_eofnblk='undef'
@@ -122,23 +122,23 @@ d_faststdio='undef'
 d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='undef'
+d_fcntl_can_lock='undef'
 d_fd_macros='undef'
-d_fds_bits='undef'
 d_fd_set='undef'
+d_fds_bits='undef'
 d_fgetpos='undef'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='undef'
-d_flockproto='undef'
 d_flock='undef'
+d_flockproto='undef'
 d_fork='define'
+d_fp_class='undef'
 d_fpathconf='undef'
+d_fpclass='undef'
 d_fpclassify='undef'
 d_fpclassl='undef'
-d_fp_class='undef'
-d_fpclass='undef'
 d_fpos64_t='undef'
 d_frexpl='undef'
 d_fs_data_s='undef'
@@ -156,8 +156,8 @@ d_getaddrinfo='undef'
 d_getcwd='undef'
 d_getespwnam='undef'
 d_getfsstat='undef'
-d_getgrent_r='undef'
 d_getgrent='undef'
+d_getgrent_r='undef'
 d_getgrgid_r='undef'
 d_getgrnam_r='undef'
 d_getgrps='undef'
@@ -170,10 +170,10 @@ d_gethostbyname_r='undef'
 d_gethostent_r='undef'
 d_gethostprotos='undef'
 d_getitimer='undef'
-d_getlogin_r='undef'
 d_getlogin='undef'
-d_getmntent='undef'
+d_getlogin_r='undef'
 d_getmnt='undef'
+d_getmntent='undef'
 d_getnameinfo='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
@@ -196,8 +196,8 @@ d_getprotobynumber_r='undef'
 d_getprotoent_r='undef'
 d_getprotoprotos='undef'
 d_getprpwnam='undef'
-d_getpwent_r='undef'
 d_getpwent='undef'
+d_getpwent_r='undef'
 d_getpwnam_r='undef'
 d_getpwuid_r='undef'
 d_getsbyname='undef'
@@ -208,8 +208,8 @@ d_getservbyport_r='undef'
 d_getservent_r='undef'
 d_getservprotos='undef'
 d_getspent='undef'
-d_getspnam_r='undef'
 d_getspnam='undef'
+d_getspnam_r='undef'
 d_gettimeod='undef'
 d_gmtime64='undef'
 d_gmtime_r='undef'
@@ -227,16 +227,16 @@ d_int64_t='undef'
 d_isascii='undef'
 d_isfinite='undef'
 d_isinf='undef'
-d_isnanl='undef'
 d_isnan='undef'
+d_isnanl='undef'
 d_killpg='undef'
 d_lchown='undef'
 d_ldbl_dig='undef'
 d_libm_lib_version='undef'
 d_link='undef'
 d_localtime64='undef'
-d_localtime_r_needs_tzset='undef'
 d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
 d_locconv='undef'
 d_lockf='undef'
 d_longdbl='undef'
@@ -257,26 +257,26 @@ d_memset='define'
 d_mkdir='undef'
 d_mkdtemp='undef'
 d_mkfifo='undef'
-d_mkstemps='undef'
 d_mkstemp='undef'
+d_mkstemps='undef'
 d_mktime64='undef'
 d_mktime='undef'
 d_mmap='undef'
+d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
-d_modfl='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
@@ -290,8 +290,6 @@ d_old_pthread_create_joinable='undef'
 d_oldpthreads='undef'
 d_oldsock='undef'
 d_open3='undef'
-nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
-nv_preserves_uv_bits='0'
 d_pathconf='undef'
 d_pause='undef'
 d_perl_otherlibdirs='undef'
@@ -660,6 +658,8 @@ netdb_host_type='const char *'
 netdb_name_type='const char *'
 netdb_net_type='unsigned long'
 nroff='nroff'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='0'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
@@ -695,18 +695,18 @@ sGMTIME_max='2147483647'
 sGMTIME_min='0'
 sLOCALTIME_max='2147483647'
 sLOCALTIME_min='0'
+sPRIEUldbl='"llE"'
+sPRIFUldbl='"llF"'
+sPRIGUldbl='"llG"'
+sPRIXU64='"lX"'
 sPRId64='"ld"'
 sPRIeldbl='"lle"'
-sPRIEUldbl='"llE"'
 sPRIfldbl='"llf"'
-sPRIFUldbl='"llF"'
 sPRIgldbl='"llg"'
-sPRIGUldbl='"llG"'
 sPRIi64='"li"'
 sPRIo64='"lo"'
 sPRIu64='"lu"'
 sPRIx64='"lx"'
-sPRIXU64='"lX"'
 sSCNfldbl='"llf"'
 sched_yield='sched_yield()'
 scriptdir='/usr/local/bin'
diff --git a/win32/config.ce b/win32/config.ce
index d92b3cf2b5..1f58933459 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -127,11 +127,11 @@ d_cmsghdr_s='undef'
 d_const='define'
 d_copysignl='undef'
 d_cplusplus='undef'
-d_crypt_r='undef'
 d_crypt='undef'
+d_crypt_r='undef'
 d_csh='undef'
-d_ctermid_r='undef'
 d_ctermid='undef'
+d_ctermid_r='undef'
 d_ctime64='undef'
 d_ctime_r='undef'
 d_cuserid='undef'
@@ -146,20 +146,20 @@ d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
 d_dosuid='undef'
-d_drand48proto='undef'
 d_drand48_r='undef'
+d_drand48proto='undef'
 d_dup2='define'
 d_eaccess='undef'
-d_endgrent_r='undef'
 d_endgrent='undef'
+d_endgrent_r='undef'
 d_endhent='undef'
 d_endhostent_r='undef'
 d_endnent='undef'
 d_endnetent_r='undef'
 d_endpent='undef'
 d_endprotoent_r='undef'
-d_endpwent_r='undef'
 d_endpwent='undef'
+d_endpwent_r='undef'
 d_endsent='undef'
 d_endservent_r='undef'
 d_endspent='undef'
@@ -169,23 +169,23 @@ d_faststdio='undef'
 d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='undef'
+d_fcntl_can_lock='undef'
 d_fd_macros='define'
-d_fds_bits='define'
 d_fd_set='define'
+d_fds_bits='define'
 d_fgetpos='define'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='define'
-d_flockproto='undef'
 d_flock='undef'
+d_flockproto='undef'
 d_fork='undef'
+d_fp_class='undef'
 d_fpathconf='undef'
+d_fpclass='undef'
 d_fpclassify='undef'
 d_fpclassl='undef'
-d_fp_class='undef'
-d_fpclass='undef'
 d_fpos64_t='undef'
 d_frexpl='undef'
 d_fs_data_s='undef'
@@ -203,8 +203,8 @@ d_getaddrinfo='undef'
 d_getcwd='define'
 d_getespwnam='undef'
 d_getfsstat='undef'
-d_getgrent_r='undef'
 d_getgrent='undef'
+d_getgrent_r='undef'
 d_getgrgid_r='undef'
 d_getgrnam_r='undef'
 d_getgrps='undef'
@@ -219,8 +219,8 @@ d_gethostprotos='define'
 d_getitimer='undef'
 d_getlogin='define'
 d_getlogin_r='undef'
-d_getmntent='undef'
 d_getmnt='undef'
+d_getmntent='undef'
 d_getnameinfo='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
@@ -243,8 +243,8 @@ d_getprotobynumber_r='undef'
 d_getprotoent_r='undef'
 d_getprotoprotos='define'
 d_getprpwnam='undef'
-d_getpwent_r='undef'
 d_getpwent='undef'
+d_getpwent_r='undef'
 d_getpwnam_r='undef'
 d_getpwuid_r='undef'
 d_getsbyname='define'
@@ -255,8 +255,8 @@ d_getservbyport_r='undef'
 d_getservent_r='undef'
 d_getservprotos='define'
 d_getspent='undef'
-d_getspnam_r='undef'
 d_getspnam='undef'
+d_getspnam_r='undef'
 d_gettimeod='undef'
 d_gmtime64='undef'
 d_gmtime_r='undef'
@@ -282,8 +282,8 @@ d_ldbl_dig='define'
 d_libm_lib_version='undef'
 d_link='define'
 d_localtime64='undef'
-d_localtime_r_needs_tzset='undef'
 d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
 d_locconv='define'
 d_lockf='undef'
 d_longdbl='undef'
@@ -304,26 +304,26 @@ d_memset='define'
 d_mkdir='define'
 d_mkdtemp='undef'
 d_mkfifo='undef'
-d_mkstemps='undef'
 d_mkstemp='undef'
+d_mkstemps='undef'
 d_mktime64='undef'
 d_mktime='define'
 d_mmap='undef'
+d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
-d_modfl='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='~PERL_MALLOC~'
@@ -449,9 +449,9 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
-d_static_inline='undef'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
+d_static_inline='undef'
 d_statvfs='undef'
 d_stdio_cnt_lval='undef'
 d_stdio_ptr_lval='undef'
@@ -797,8 +797,8 @@ nm_opt=''
 nm_so_opt=''
 nonxs_ext='Errno'
 nroff=''
-nv_preserves_uv_bits='32'
 nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='32'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
@@ -820,9 +820,9 @@ path_sep=';'
 perl5=''
 perl='perl'
 perl_patchlevel='~PERL_PATCHLEVEL~'
+perl_static_inline='static'
 perladmin=''
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
-perl_static_inline='static'
 pg=''
 phostname='hostname'
 pidtype='int'
@@ -922,6 +922,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src=''
 ssizetype='int'
+st_ino_sign='1'
+st_ino_size='4'
 startperl='#!perl'
 startsh='#!/bin/sh'
 static_ext='DynaLoader'
@@ -932,8 +934,6 @@ stdio_cnt=''
 stdio_filbuf=''
 stdio_ptr=''
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='4'
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
diff --git a/win32/config.gc b/win32/config.gc
index 8c00871b01..5741584252 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -170,14 +170,14 @@ d_faststdio='define'
 d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='undef'
+d_fcntl_can_lock='undef'
 d_fd_macros='define'
 d_fd_set='define'
 d_fds_bits='define'
 d_fgetpos='define'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='define'
 d_flock='define'
 d_flockproto='define'
@@ -313,17 +313,17 @@ d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
@@ -449,9 +449,9 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
-d_static_inline='define'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
+d_static_inline='define'
 d_statvfs='undef'
 d_stdio_cnt_lval='define'
 d_stdio_ptr_lval='define'
@@ -851,10 +851,10 @@ path_sep=';'
 perl5=''
 perl='perl'
 perl_patchlevel='~PERL_PATCHLEVEL~'
+perl_static_inline='static __inline__'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
-perl_static_inline='static __inline__'
 pg=''
 phostname='hostname'
 pidtype='int'
@@ -964,6 +964,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src=''
 ssizetype='int'
+st_ino_sign='1'
+st_ino_size='4'
 startperl='#!perl'
 startsh='#!/bin/sh'
 static_ext=' '
@@ -974,8 +976,6 @@ stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='4'
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
diff --git a/win32/config.gc64 b/win32/config.gc64
index d225638aad..bc6210e558 100644
--- a/win32/config.gc64
+++ b/win32/config.gc64
@@ -170,14 +170,14 @@ d_faststdio='define'
 d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='undef'
+d_fcntl_can_lock='undef'
 d_fd_macros='define'
 d_fd_set='define'
 d_fds_bits='define'
 d_fgetpos='define'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='define'
 d_flock='define'
 d_flockproto='define'
@@ -313,17 +313,17 @@ d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
@@ -449,9 +449,9 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
-d_static_inline='define'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
+d_static_inline='define'
 d_statvfs='undef'
 d_stdio_cnt_lval='define'
 d_stdio_ptr_lval='define'
@@ -852,10 +852,10 @@ path_sep=';'
 perl5=''
 perl='perl'
 perl_patchlevel='~PERL_PATCHLEVEL~'
+perl_static_inline='static __inline__'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
-perl_static_inline='static __inline__'
 pg=''
 phostname='hostname'
 pidtype='int'
@@ -965,6 +965,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src=''
 ssizetype='long long'
+st_ino_sign='1'
+st_ino_size='8'
 startperl='#!perl'
 startsh='#!/bin/sh'
 static_ext=' '
@@ -975,8 +977,6 @@ stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='8'
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
diff --git a/win32/config.gc64nox b/win32/config.gc64nox
index 4ad66faf32..fc407ad7aa 100644
--- a/win32/config.gc64nox
+++ b/win32/config.gc64nox
@@ -170,14 +170,14 @@ d_faststdio='define'
 d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='undef'
+d_fcntl_can_lock='undef'
 d_fd_macros='define'
 d_fd_set='define'
 d_fds_bits='define'
 d_fgetpos='define'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='define'
 d_flock='define'
 d_flockproto='define'
@@ -313,17 +313,17 @@ d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
@@ -449,9 +449,9 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
-d_static_inline='define'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
+d_static_inline='define'
 d_statvfs='undef'
 d_stdio_cnt_lval='define'
 d_stdio_ptr_lval='define'
@@ -852,10 +852,10 @@ path_sep=';'
 perl5=''
 perl='perl'
 perl_patchlevel='~PERL_PATCHLEVEL~'
+perl_static_inline='static __inline__'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
-perl_static_inline='static __inline__'
 pg=''
 phostname='hostname'
 pidtype='int'
@@ -965,6 +965,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src=''
 ssizetype='long long'
+st_ino_sign='1'
+st_ino_size='8'
 startperl='#!perl'
 startsh='#!/bin/sh'
 static_ext=' '
@@ -975,8 +977,6 @@ stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='8'
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
diff --git a/win32/config.vc b/win32/config.vc
index 74ae27552b..30957919e1 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -170,14 +170,14 @@ d_faststdio='define'
 d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='undef'
+d_fcntl_can_lock='undef'
 d_fd_macros='define'
 d_fd_set='define'
 d_fds_bits='define'
 d_fgetpos='define'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='define'
 d_flock='define'
 d_flockproto='define'
@@ -313,17 +313,17 @@ d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
@@ -449,9 +449,9 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
-d_static_inline='define'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
+d_static_inline='define'
 d_statvfs='undef'
 d_stdio_cnt_lval='define'
 d_stdio_ptr_lval='define'
@@ -851,10 +851,10 @@ path_sep=';'
 perl5=''
 perl='perl'
 perl_patchlevel='~PERL_PATCHLEVEL~'
+perl_static_inline='static __inline'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
-perl_static_inline='static __inline'
 pg=''
 phostname='hostname'
 pidtype='int'
@@ -964,6 +964,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src=''
 ssizetype='int'
+st_ino_sign='1'
+st_ino_size='4'
 startperl='#!perl'
 startsh='#!/bin/sh'
 static_ext=' '
@@ -974,8 +976,6 @@ stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='4'
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
diff --git a/win32/config.vc64 b/win32/config.vc64
index ac5e61e17e..1396a0ad00 100644
--- a/win32/config.vc64
+++ b/win32/config.vc64
@@ -170,14 +170,14 @@ d_faststdio='define'
 d_fchdir='undef'
 d_fchmod='undef'
 d_fchown='undef'
-d_fcntl_can_lock='undef'
 d_fcntl='undef'
+d_fcntl_can_lock='undef'
 d_fd_macros='define'
 d_fd_set='define'
 d_fds_bits='define'
 d_fgetpos='define'
-d_finitel='undef'
 d_finite='undef'
+d_finitel='undef'
 d_flexfnam='define'
 d_flock='define'
 d_flockproto='define'
@@ -313,17 +313,17 @@ d_modfl='undef'
 d_modfl_pow32_bug='undef'
 d_modflproto='undef'
 d_mprotect='undef'
-d_msgctl='undef'
+d_msg='undef'
 d_msg_ctrunc='undef'
 d_msg_dontroute='undef'
-d_msgget='undef'
-d_msghdr_s='undef'
 d_msg_oob='undef'
 d_msg_peek='undef'
 d_msg_proxy='undef'
+d_msgctl='undef'
+d_msgget='undef'
+d_msghdr_s='undef'
 d_msgrcv='undef'
 d_msgsnd='undef'
-d_msg='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
@@ -449,9 +449,9 @@ d_srandom_r='undef'
 d_sresgproto='undef'
 d_sresuproto='undef'
 d_statblks='undef'
-d_static_inline='define'
 d_statfs_f_flags='undef'
 d_statfs_s='undef'
+d_static_inline='define'
 d_statvfs='undef'
 d_stdio_cnt_lval='define'
 d_stdio_ptr_lval='define'
@@ -851,10 +851,10 @@ path_sep=';'
 perl5=''
 perl='perl'
 perl_patchlevel='~PERL_PATCHLEVEL~'
+perl_static_inline='static __inline'
 perladmin=''
 perllibs='~libs~'
 perlpath='~INST_TOP~~INST_VER~\bin~INST_ARCH~\perl.exe'
-perl_static_inline='static __inline'
 pg=''
 phostname='hostname'
 pidtype='int'
@@ -964,6 +964,8 @@ srand48_r_proto='0'
 srandom_r_proto='0'
 src=''
 ssizetype='__int64'
+st_ino_sign='1'
+st_ino_size='8'
 startperl='#!perl'
 startsh='#!/bin/sh'
 static_ext=' '
@@ -974,8 +976,6 @@ stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
 stdio_stream_array=''
-st_ino_sign='1'
-st_ino_size='8'
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''