various cleanups

p4raw-id: //depot/perl@4350

16 files changed, 545 insertions, 206 deletions

diff --git a/ext/Devel/DProf/DProf.xs b/ext/Devel/DProf/DProf.xs
index 220a1e2e92..533f94b5bf 100644
--- a/ext/Devel/DProf/DProf.xs
+++ b/ext/Devel/DProf/DProf.xs
@@ -471,7 +471,7 @@ test_time(clock_t *r, clock_t *u, clock_t *s)
 }
 
 static void
-prof_recordheader()
+prof_recordheader(void)
 {
 	clock_t r, u, s;
 
@@ -498,7 +498,7 @@ prof_recordheader()
 }
 
 static void
-prof_record()
+prof_record(void)
 {
         /* fp is opened in the BOOT section */
 
diff --git a/op.c b/op.c
index b0a5bc4fb3..c59940dd4e 100644
--- a/op.c
+++ b/op.c
@@ -6158,8 +6158,10 @@ Perl_peep(pTHX_ register OP *o)
 	case OP_RV2AV:
 	case OP_RV2HV:
 	    if (!(o->op_flags & OPf_WANT)
-		|| o->op_flags & OPf_WANT == OPf_WANT_LIST)
+		|| (o->op_flags & OPf_WANT) == OPf_WANT_LIST)
+	    {
 		last_composite = o;
+	    }
 	    o->op_seq = PL_op_seqmax++;
 	    break;
 
diff --git a/perl.c b/perl.c
index aca20cb437..74884b2419 100644
--- a/perl.c
+++ b/perl.c
@@ -75,7 +75,7 @@ perl_construct(pTHXx)
 #ifdef USE_THREADS
     int i;
 #ifndef FAKE_THREADS
-    struct perl_thread *thr;
+    struct perl_thread *thr = NULL;
 #endif /* FAKE_THREADS */
 #endif /* USE_THREADS */
     
diff --git a/perly.c b/perly.c
index 0ed07fcf12..64ad3b5582 100644
--- a/perly.c
+++ b/perly.c
@@ -29,22 +29,7 @@ struct ysv {
     YYSTYPE oldyylval;
 };
 
-static void yydestruct(void *ptr);
-
-static void
-yydestruct(void *ptr)
-{
-    struct ysv* ysave = (struct ysv*)ptr;
-    if (ysave->yyss) Safefree(ysave->yyss);
-    if (ysave->yyvs) Safefree(ysave->yyvs);
-    yydebug	= ysave->oldyydebug;
-    yynerrs	= ysave->oldyynerrs;
-    yyerrflag	= ysave->oldyyerrflag;
-    yychar	= ysave->oldyychar;
-    yyval	= ysave->oldyyval;
-    yylval	= ysave->oldyylval;
-    Safefree(ysave);
-}
+static void yydestruct(pTHXo_ void *ptr);
 
 #line 49 "perly.y"
 #if 0 /* get this from perly.h instead */
@@ -1402,7 +1387,7 @@ yyparse()
 
     struct ysv *ysave;
     New(73, ysave, 1, struct ysv);
-    SAVEDESTRUCTOR(yydestruct, ysave);
+    SAVEDESTRUCTOR_X(yydestruct, ysave);
     ysave->oldyydebug	= yydebug;
     ysave->oldyynerrs	= yynerrs;
     ysave->oldyyerrflag	= yyerrflag;
@@ -2494,3 +2479,23 @@ yyabort:
 yyaccept:
     return retval;
 }
+
+#ifdef PERL_OBJECT
+#define NO_XSLOCKS
+#include "XSUB.h"
+#endif
+
+static void
+yydestruct(pTHXo_ void *ptr)
+{
+    struct ysv* ysave = (struct ysv*)ptr;
+    if (ysave->yyss) Safefree(ysave->yyss);
+    if (ysave->yyvs) Safefree(ysave->yyvs);
+    yydebug	= ysave->oldyydebug;
+    yynerrs	= ysave->oldyynerrs;
+    yyerrflag	= ysave->oldyyerrflag;
+    yychar	= ysave->oldyychar;
+    yyval	= ysave->oldyyval;
+    yylval	= ysave->oldyylval;
+    Safefree(ysave);
+}
diff --git a/perly.y b/perly.y
index 93e5f77af9..c8163e135e 100644
--- a/perly.y
+++ b/perly.y
@@ -39,22 +39,7 @@ struct ysv {
     YYSTYPE oldyylval;
 };
 
-static void yydestruct(void *ptr);
-
-static void
-yydestruct(void *ptr)
-{
-    struct ysv* ysave = (struct ysv*)ptr;
-    if (ysave->yyss) Safefree(ysave->yyss);
-    if (ysave->yyvs) Safefree(ysave->yyvs);
-    yydebug	= ysave->oldyydebug;
-    yynerrs	= ysave->oldyynerrs;
-    yyerrflag	= ysave->oldyyerrflag;
-    yychar	= ysave->oldyychar;
-    yyval	= ysave->oldyyval;
-    yylval	= ysave->oldyylval;
-    Safefree(ysave);
-}
+static void yydestruct(pTHXo_ void *ptr);
 
 %}
 
diff --git a/perly_c.diff b/perly_c.diff
index f42a10c9ef..450b159fb2 100644
--- a/perly_c.diff
+++ b/perly_c.diff
@@ -28,7 +28,7 @@
   
 +     struct ysv *ysave;
 +     New(73, ysave, 1, struct ysv);
-+     SAVEDESTRUCTOR(yydestruct, ysave);
++     SAVEDESTRUCTOR_X(yydestruct, ysave);
 +     ysave->oldyydebug	= yydebug;
 +     ysave->oldyynerrs	= yynerrs;
 +     ysave->oldyyerrflag	= yyerrflag;
@@ -134,7 +134,7 @@
   yyaccept:
 !     return (0);
   }
---- 2524,2550 ----
+--- 2524,2570 ----
   #endif
       if (yyssp >= yyss + yystacksize - 1)
       {
@@ -161,4 +161,24 @@
 !     retval = 1;
   yyaccept:
 !     return retval;
+! }
+! 
+! #ifdef PERL_OBJECT
+! #define NO_XSLOCKS
+! #include "XSUB.h"
+! #endif
+! 
+! static void
+! yydestruct(pTHXo_ void *ptr)
+! {
+!     struct ysv* ysave = (struct ysv*)ptr;
+!     if (ysave->yyss) Safefree(ysave->yyss);
+!     if (ysave->yyvs) Safefree(ysave->yyvs);
+!     yydebug	= ysave->oldyydebug;
+!     yynerrs	= ysave->oldyynerrs;
+!     yyerrflag	= ysave->oldyyerrflag;
+!     yychar	= ysave->oldyychar;
+!     yyval	= ysave->oldyyval;
+!     yylval	= ysave->oldyylval;
+!     Safefree(ysave);
   }
diff --git a/pp_hot.c b/pp_hot.c
index 344b8086c1..2a398e15d3 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -1998,7 +1998,7 @@ PP(pp_leavesublv)
 		else {
 		    /* Can be a localized value subject to deletion. */
 		    PL_tmps_stack[++PL_tmps_ix] = *mark;
-		    SvREFCNT_inc(*mark);
+		    (void)SvREFCNT_inc(*mark);
 		}
 	    }
 	}
@@ -2029,7 +2029,7 @@ PP(pp_leavesublv)
 		else {                  /* Can be a localized value
 					 * subject to deletion. */
 		    PL_tmps_stack[++PL_tmps_ix] = *mark;
-		    SvREFCNT_inc(*mark);
+		    (void)SvREFCNT_inc(*mark);
 		}
 	    }
 	    else {			/* Should not happen? */
@@ -2062,7 +2062,7 @@ PP(pp_leavesublv)
 		    mortalize:
 		    /* Can be a localized value subject to deletion. */
 		    PL_tmps_stack[++PL_tmps_ix] = *mark;
-		    SvREFCNT_inc(*mark);
+		    (void)SvREFCNT_inc(*mark);
 		}
 	    }
 	}
diff --git a/toke.c b/toke.c
index 4cab2a22dc..49dc8b757c 100644
--- a/toke.c
+++ b/toke.c
@@ -5540,12 +5540,12 @@ S_new_constant(pTHX_ char *s, STRLEN len, char *key, SV *sv, SV *pv, char *type)
 	STRLEN n_a;
  	sv_catpv(ERRSV, "Propagated");
 	yyerror(SvPV(ERRSV, n_a)); /* Duplicates the message inside eval */
-	POPs ;
+	(void)POPs;
  	res = SvREFCNT_inc(sv);
     }
     else {
  	res = POPs;
- 	SvREFCNT_inc(res);
+ 	(void)SvREFCNT_inc(res);
     }
     
     PUTBACK ;
diff --git a/vms/perly_c.vms b/vms/perly_c.vms
index 8014792169..acecce7554 100644
--- a/vms/perly_c.vms
+++ b/vms/perly_c.vms
@@ -30,22 +30,7 @@ struct ysv {
     YYSTYPE oldyylval;
 };
 
-static void yydestruct(void *ptr);
-
-static void
-yydestruct(void *ptr)
-{
-    struct ysv* ysave = (struct ysv*)ptr;
-    if (ysave->yyss) Safefree(ysave->yyss);
-    if (ysave->yyvs) Safefree(ysave->yyvs);
-    yydebug	= ysave->oldyydebug;
-    yynerrs	= ysave->oldyynerrs;
-    yyerrflag	= ysave->oldyyerrflag;
-    yychar	= ysave->oldyychar;
-    yyval	= ysave->oldyyval;
-    yylval	= ysave->oldyylval;
-    Safefree(ysave);
-}
+static void yydestruct(pTHXo_ void *ptr);
 
 #line 49 "perly.y"
 #if 0 /* get this from perly.h instead */
@@ -1403,7 +1388,7 @@ yyparse()
 
     struct ysv *ysave;
     New(73, ysave, 1, struct ysv);
-    SAVEDESTRUCTOR(yydestruct, ysave);
+    SAVEDESTRUCTOR_X(yydestruct, ysave);
     ysave->oldyydebug	= yydebug;
     ysave->oldyynerrs	= yynerrs;
     ysave->oldyyerrflag	= yyerrflag;
@@ -1679,7 +1664,7 @@ case 21:
 break;
 case 22:
 #line 203 "perly.y"
-{ yyval.opval = scope(yyvsp[0].opval); }
+{ (yyvsp[0].opval)->op_flags |= OPf_PARENS; yyval.opval = scope(yyvsp[0].opval); }
 break;
 case 23:
 #line 205 "perly.y"
@@ -2496,3 +2481,23 @@ yyabort:
 yyaccept:
     return retval;
 }
+
+#ifdef PERL_OBJECT
+#define NO_XSLOCKS
+#include "XSUB.h"
+#endif
+
+static void
+yydestruct(pTHXo_ void *ptr)
+{
+    struct ysv* ysave = (struct ysv*)ptr;
+    if (ysave->yyss) Safefree(ysave->yyss);
+    if (ysave->yyvs) Safefree(ysave->yyvs);
+    yydebug	= ysave->oldyydebug;
+    yynerrs	= ysave->oldyynerrs;
+    yyerrflag	= ysave->oldyyerrflag;
+    yychar	= ysave->oldyychar;
+    yyval	= ysave->oldyyval;
+    yylval	= ysave->oldyylval;
+    Safefree(ysave);
+}
diff --git a/win32/config.bc b/win32/config.bc
index 46b77965d8..edf4072a35 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -8,12 +8,8 @@ Id='$Id'
 Locker=''
 Log='$Log'
 Mcc='Mcc'
-PERL_VERSION='~PERL_VERSION~'
-PERL_SUBVERSION='~PERL_SUBVERSION~'
-PATCHLEVEL='~PERL_VERSION~'
 RCSfile='$RCSfile'
 Revision='$Revision'
-SUBVERSION='~PERL_SUBVERSION~'
 Source=''
 State=''
 _a='.lib'
@@ -34,6 +30,7 @@ awk='awk'
 baserev='5.0'
 bash=''
 bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
+bincompat5005='undef'
 binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 bison=''
 byacc='byacc'
@@ -71,13 +68,28 @@ crosscompile='undef'
 cryptlib=''
 csh='undef'
 d_Gconvert='gcvt((x),(n),(b))'
+d_PRIEldbl='undef'
+d_PRIFldbl='undef'
+d_PRIGldbl='undef'
+d_PRIX64='undef'
+d_PRId64='undef'
+d_PRIeldbl='undef'
+d_PRIfldbl='undef'
+d_PRIgldbl='undef'
+d_PRIi64='undef'
+d_PRIo64='undef'
+d_PRIu64='undef'
+d_PRIx64='undef'
 d_access='define'
 d_accessx='undef'
 d_alarm='undef'
 d_archlib='define'
+d_atolf='undef'
+d_atoll='undef'
 d_attribut='undef'
 d_bcmp='undef'
 d_bcopy='undef'
+d_bincompat5005='undef'
 d_bsd='define'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='undef'
@@ -95,11 +107,7 @@ d_crypt='undef'
 d_csh='undef'
 d_cuserid='undef'
 d_dbl_dig='define'
-d_dbmclose64='undef'
-d_dbminit64='undef'
-d_delete64='undef'
 d_difftime='define'
-d_dirent64_s='undef'
 d_dirnamlen='define'
 d_dlerror='define'
 d_dlopen='define'
@@ -114,6 +122,7 @@ d_endnent='undef'
 d_endpent='undef'
 d_endpwent='undef'
 d_endsent='undef'
+d_endspent='undef'
 d_eofnblk='define'
 d_eunice='undef'
 d_fchmod='undef'
@@ -122,30 +131,18 @@ d_fcntl='undef'
 d_fd_macros='define'
 d_fd_set='define'
 d_fds_bits='define'
-d_fetch64='undef'
 d_fgetpos='define'
-d_fgetpos64='undef'
-d_firstkey64='undef'
 d_flexfnam='define'
 d_flock='define'
-d_flock64_s='undef'
-d_fopen64='undef'
 d_fork='undef'
 d_fpathconf='undef'
-d_freopen64='undef'
-d_fseek64='undef'
+d_fpos64_t='undef'
 d_fseeko='undef'
-d_fseeko64='undef'
 d_fsetpos='define'
-d_fsetpos64='undef'
-d_fstat64='undef'
 d_fstatfs='undef'
 d_fstatvfs='undef'
-d_ftell64='undef'
 d_ftello='undef'
-d_ftello64='undef'
 d_ftime='define'
-d_ftruncate64='undef'
 d_getgrent='undef'
 d_getgrps='undef'
 d_gethbyaddr='define'
@@ -154,6 +151,7 @@ d_gethent='undef'
 d_gethname='define'
 d_gethostprotos='define'
 d_getlogin='define'
+d_getmntent='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
 d_getnent='undef'
@@ -172,13 +170,15 @@ d_getsbyname='define'
 d_getsbyport='define'
 d_getsent='undef'
 d_getservprotos='define'
+d_getspent='undef'
+d_getspnam='undef'
 d_gettimeod='undef'
 d_grpasswd='undef'
+d_hasmntopt='undef'
 d_gnulibc='undef'
 d_htonl='define'
 d_index='undef'
 d_inetaton='undef'
-d_ino64t='undef'
 d_int64t='undef'
 d_iovec_s='undef'
 d_isascii='define'
@@ -186,18 +186,17 @@ d_killpg='undef'
 d_ldbl_dig='define'
 d_lchown='undef'
 d_link='undef'
+d_llseek='undef'
 d_locconv='define'
 d_lockf='undef'
-d_lockf64='undef'
 d_longdbl='define'
 d_longlong='undef'
-d_lseek64='undef'
 d_lstat='undef'
-d_lstat64='undef'
 d_madvise='undef'
 d_mblen='define'
 d_mbstowcs='define'
 d_mbtowc='define'
+d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
 d_memmove='define'
@@ -221,15 +220,12 @@ d_msgsnd='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
-d_nextkey64='undef'
 d_nice='undef'
-d_off64t='undef'
+d_off64_t='undef'
 d_old_pthread_create_joinable='undef'
 d_oldpthreads='undef'
 d_oldsock='undef'
 d_open3='undef'
-d_open64='undef'
-d_opendir64='undef'
 d_pathconf='undef'
 d_pause='define'
 d_phostname='undef'
@@ -246,10 +242,9 @@ d_pwgecos='undef'
 d_pwquota='undef'
 d_pwpasswd='undef'
 d_readdir='define'
-d_readdir64='undef'
 d_readlink='undef'
 d_readv='undef'
-d_recvmesg='undef'
+d_recvmsg='undef'
 d_rename='define'
 d_rewinddir='define'
 d_rmdir='define'
@@ -259,7 +254,6 @@ d_sanemcmp='define'
 d_sched_yield='undef'
 d_scm_rights='undef'
 d_seekdir='define'
-d_seekdir64='undef'
 d_select='define'
 d_sem='undef'
 d_semctl='undef'
@@ -290,6 +284,7 @@ d_setrgid='undef'
 d_setruid='undef'
 d_setsent='undef'
 d_setsid='undef'
+d_setspent='undef'
 d_setvbuf='define'
 d_sfio='undef'
 d_shm='undef'
@@ -302,16 +297,15 @@ d_sigaction='undef'
 d_sigsetjmp='undef'
 d_socket='define'
 d_sockpair='undef'
-d_stat64='undef'
 d_statblks='undef'
 d_statfs='undef'
 d_statfsflags='undef'
 d_statvfs='undef'
 d_stdio_cnt_lval='define'
 d_stdio_ptr_lval='define'
+d_stdio_stream_array='undef'
 d_stdiobase='define'
 d_stdstdio='define'
-d_store64='undef'
 d_strchr='define'
 d_strcoll='define'
 d_strctcpy='define'
@@ -320,6 +314,7 @@ d_strerror='define'
 d_strtod='define'
 d_strtol='define'
 d_strtoul='define'
+d_strtoull='undef'
 d_strxfrm='define'
 d_suidsafe='undef'
 d_symlink='undef'
@@ -331,17 +326,15 @@ d_system='define'
 d_tcgetpgrp='undef'
 d_tcsetpgrp='undef'
 d_telldir='define'
-d_telldir64='undef'
 d_telldirproto='define'
 d_time='define'
 d_times='define'
-d_tmpfile64='undef'
 d_truncate='undef'
-d_truncate64='undef'
 d_tzname='define'
 d_umask='define'
 d_uname='define'
 d_union_semun='define'
+d_vendorlib='undef'
 d_vfork='undef'
 d_void_closedir='undef'
 d_voidsig='define'
@@ -380,6 +373,7 @@ firstmakefile='makefile'
 flex=''
 fpostype='fpos_t'
 freetype='void'
+full_ar=''
 full_csh=''
 full_sed=''
 gccversion=''
@@ -416,12 +410,16 @@ i_mntent='undef'
 i_ndbm='undef'
 i_netdb='undef'
 i_neterrno='undef'
+i_netinettcp='undef'
 i_niin='undef'
 i_poll='undef'
+i_pthread='undef'
 i_pwd='undef'
 i_rpcsvcdbm='define'
 i_sfio='undef'
 i_sgtty='undef'
+i_shadow='undef'
+i_socks='undef'
 i_stdarg='define'
 i_stddef='define'
 i_stdlib='define'
@@ -465,13 +463,17 @@ installarchlib='~INST_TOP~~INST_VER~\lib~INST_ARCH~'
 installbin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 installman1dir='~INST_TOP~~INST_VER~\man\man1'
 installman3dir='~INST_TOP~~INST_VER~\man\man3'
+installprefix='~INST_TOP~~INST_VER~'
+installprefixexp='~INST_TOP~~INST_VER~'
 installhtmldir='~INST_TOP~~INST_VER~\html'
 installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp'
 installprivlib='~INST_TOP~~INST_VER~\lib'
 installscript='~INST_TOP~~INST_VER~\bin'
 installsitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
 installsitelib='~INST_TOP~\site~INST_VER~\lib'
+installstyle='lib'
 installusrbinperl='undef'
+installvendorlib=''
 intsize='4'
 known_extensions='DB_File Fcntl GDBM_File NDBM_File ODBM_File Opcode POSIX SDBM_File Socket IO attrs Thread'
 ksh=''
@@ -479,6 +481,7 @@ large=''
 ld='tlink32'
 lddlflags='-Tpd ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
+ldlibpthname=''
 less='less'
 lib_ext='.lib'
 libc='cw32mti.lib'
@@ -557,6 +560,7 @@ pg=''
 phostname='hostname'
 pidtype='int'
 plibpth=''
+pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='~INST_TOP~'
@@ -573,6 +577,18 @@ rd_nodata='-1'
 rm='del'
 rmail=''
 runnm='true'
+sPRIEldbl='"E"'
+sPRIFldbl='"F"'
+sPRIGldbl='"G"'
+sPRIX64='"lX"'
+sPRId64='"ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"li"'
+sPRIo64='"lo"'
+sPRIu64='"lu"'
+sPRIx64='"lx"'
 sched_yield=''
 scriptdir='~INST_TOP~~INST_VER~\bin'
 scriptdirexp='~INST_TOP~~INST_VER~\bin'
@@ -588,6 +604,7 @@ shmattype='void *'
 shortsize='2'
 shrpenv=''
 shsharp='true'
+sig_count='26'
 sig_name='ZERO NUM01 INT QUIT ILL NUM05 NUM06 NUM07 FPE KILL NUM10 SEGV NUM12 PIPE ALRM TERM USR1 USR2 CHLD NUM19 USR3 BREAK ABRT STOP NUM24 CONT CLD'
 sig_name_init='"ZERO", "NUM01", "INT", "QUIT", "ILL", "NUM05", "NUM06", "NUM07", "FPE", "KILL", "NUM10", "SEGV", "NUM12", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "NUM19", "USR3", "BREAK", "ABRT", "STOP", "NUM24", "CONT", "CLD", 0'
 sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 18 0'
@@ -597,6 +614,8 @@ sitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
 sitearchexp='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
 sitelib='~INST_TOP~\site~INST_VER~\lib'
 sitelibexp='~INST_TOP~\site~INST_VER~\lib'
+siteprefix='~INST_TOP~\site~INST_VER~'
+siteprefixexp='~INST_TOP~\site~INST_VER~'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -619,6 +638,7 @@ stdio_bufsiz='((fp)->level + (fp)->curp - (fp)->buffer)'
 stdio_cnt='((fp)->level)'
 stdio_filbuf=''
 stdio_ptr='((fp)->curp)'
+stdio_stream_array=''
 strings='/usr/include/string.h'
 submit=''
 subversion='~SUBVERSION~'
@@ -634,11 +654,15 @@ touch='touch'
 tr=''
 trnl='\012'
 troff=''
+uidsign='-1'
 uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 use64bits='undef'
 usedl='define'
+uselargefiles='undef'
+uselongdouble='undef'
+usemorebits='undef'
 usemultiplicity='undef'
 usemymalloc='n'
 usenm='false'
@@ -647,13 +671,26 @@ useperlio='undef'
 useposix='true'
 usesfio='false'
 useshrplib='yes'
+usesocks='undef'
 usethreads='undef'
+usevendorprefix='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
+vendorlib=''
+vendorlibexp=''
+vendorprefix=''
+vendorprefixexp=''
 version='~VERSION~'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
+xs_apiversion='5.00562'
 zcat=''
 zip='zip'
+PERL_REVISION='~PERL_REVISION~'
+PERL_VERSION='~PERL_VERSION~'
+PERL_SUBVERSION='~PERL_SUBVERSION~'
+PERL_APIVERSION='5.00562'
+PATCHLEVEL='~PERL_VERSION~'
+SUBVERSION='~PERL_SUBVERSION~'
diff --git a/win32/config.gc b/win32/config.gc
index a109f452c5..6d911a6062 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -8,12 +8,8 @@ Id='$Id'
 Locker=''
 Log='$Log'
 Mcc='Mcc'
-PERL_VERSION='~PERL_VERSION~'
-PERL_SUBVERSION='~PERL_SUBVERSION~'
-PATCHLEVEL='~PERL_VERSION~'
 RCSfile='$RCSfile'
 Revision='$Revision'
-SUBVERSION='~PERL_SUBVERSION~'
 Source=''
 State=''
 _a='.a'
@@ -34,6 +30,7 @@ awk='awk'
 baserev='5.0'
 bash=''
 bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
+bincompat5005='undef'
 binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 bison=''
 byacc='byacc'
@@ -71,13 +68,28 @@ crosscompile='undef'
 cryptlib=''
 csh='undef'
 d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEldbl='undef'
+d_PRIFldbl='undef'
+d_PRIGldbl='undef'
+d_PRIX64='undef'
+d_PRId64='undef'
+d_PRIeldbl='undef'
+d_PRIfldbl='undef'
+d_PRIgldbl='undef'
+d_PRIi64='undef'
+d_PRIo64='undef'
+d_PRIu64='undef'
+d_PRIx64='undef'
 d_access='define'
 d_accessx='undef'
 d_alarm='undef'
 d_archlib='define'
+d_atolf='undef'
+d_atoll='undef'
 d_attribut='define'
 d_bcmp='undef'
 d_bcopy='undef'
+d_bincompat5005='undef'
 d_bsd='define'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='undef'
@@ -95,11 +107,7 @@ d_crypt='undef'
 d_csh='undef'
 d_cuserid='undef'
 d_dbl_dig='define'
-d_dbmclose64='undef'
-d_dbminit64='undef'
-d_delete64='undef'
 d_difftime='define'
-d_dirent64_s='undef'
 d_dirnamlen='define'
 d_dlerror='define'
 d_dlopen='define'
@@ -114,6 +122,7 @@ d_endnent='undef'
 d_endpent='undef'
 d_endpwent='undef'
 d_endsent='undef'
+d_endspent='undef'
 d_eofnblk='define'
 d_eunice='undef'
 d_fchmod='undef'
@@ -122,30 +131,18 @@ d_fcntl='undef'
 d_fd_macros='define'
 d_fd_set='define'
 d_fds_bits='define'
-d_fetch64='undef'
 d_fgetpos='define'
-d_fgetpos64='undef'
-d_firstkey64='undef'
 d_flexfnam='define'
 d_flock='define'
-d_flock64_s='undef'
-d_fopen64='undef'
 d_fork='undef'
 d_fpathconf='undef'
-d_freopen64='undef'
-d_fseek64='undef'
+d_fpos64_t='undef'
 d_fseeko='undef'
-d_fseeko64='undef'
 d_fsetpos='define'
-d_fsetpos64='undef'
-d_fstat64='undef'
 d_fstatfs='undef'
 d_fstatvfs='undef'
-d_ftell64='undef'
 d_ftello='undef'
-d_ftello64='undef'
 d_ftime='define'
-d_ftruncate64='undef'
 d_getgrent='undef'
 d_getgrps='undef'
 d_gethbyaddr='define'
@@ -154,6 +151,7 @@ d_gethent='undef'
 d_gethname='define'
 d_gethostprotos='define'
 d_getlogin='define'
+d_getmntent='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
 d_getnent='undef'
@@ -172,13 +170,15 @@ d_getsbyname='define'
 d_getsbyport='define'
 d_getsent='undef'
 d_getservprotos='define'
+d_getspent='undef'
+d_getspnam='undef'
 d_gettimeod='undef'
 d_grpasswd='undef'
+d_hasmntopt='undef'
 d_gnulibc='undef'
 d_htonl='define'
 d_index='undef'
 d_inetaton='undef'
-d_ino64t='undef'
 d_int64t='undef'
 d_iovec_s='undef'
 d_isascii='define'
@@ -186,18 +186,17 @@ d_killpg='undef'
 d_ldbl_dig='define'
 d_lchown='undef'
 d_link='undef'
+d_llseek='undef'
 d_locconv='define'
 d_lockf='undef'
-d_lockf64='undef'
 d_longdbl='define'
 d_longlong='undef'
-d_lseek64='undef'
 d_lstat='undef'
-d_lstat64='undef'
 d_madvise='undef'
 d_mblen='define'
 d_mbstowcs='define'
 d_mbtowc='define'
+d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
 d_memmove='define'
@@ -221,15 +220,12 @@ d_msgsnd='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
-d_nextkey64='undef'
 d_nice='undef'
-d_off64t='undef'
+d_off64_t='undef'
 d_old_pthread_create_joinable='undef'
 d_oldpthreads='undef'
 d_oldsock='undef'
 d_open3='undef'
-d_open64='undef'
-d_opendir64='undef'
 d_pathconf='undef'
 d_pause='define'
 d_phostname='undef'
@@ -246,10 +242,9 @@ d_pwgecos='undef'
 d_pwquota='undef'
 d_pwpasswd='undef'
 d_readdir='define'
-d_readdir64='undef'
 d_readlink='undef'
 d_readv='undef'
-d_recvmesg='undef'
+d_recvmsg='undef'
 d_rename='define'
 d_rewinddir='define'
 d_rmdir='define'
@@ -259,7 +254,6 @@ d_sanemcmp='define'
 d_sched_yield='undef'
 d_scm_rights='undef'
 d_seekdir='define'
-d_seekdir64='undef'
 d_select='define'
 d_sem='undef'
 d_semctl='undef'
@@ -290,6 +284,7 @@ d_setrgid='undef'
 d_setruid='undef'
 d_setsent='undef'
 d_setsid='undef'
+d_setspent='undef'
 d_setvbuf='define'
 d_sfio='undef'
 d_shm='undef'
@@ -302,16 +297,15 @@ d_sigaction='undef'
 d_sigsetjmp='undef'
 d_socket='define'
 d_sockpair='undef'
-d_stat64='undef'
 d_statblks='undef'
 d_statfs='undef'
 d_statfsflags='undef'
 d_statvfs='undef'
 d_stdio_cnt_lval='define'
 d_stdio_ptr_lval='define'
+d_stdio_stream_array='undef'
 d_stdiobase='undef'
 d_stdstdio='undef'
-d_store64='undef'
 d_strchr='define'
 d_strcoll='define'
 d_strctcpy='define'
@@ -320,6 +314,7 @@ d_strerror='define'
 d_strtod='define'
 d_strtol='define'
 d_strtoul='define'
+d_strtoull='undef'
 d_strxfrm='define'
 d_suidsafe='undef'
 d_symlink='undef'
@@ -331,17 +326,15 @@ d_system='define'
 d_tcgetpgrp='undef'
 d_tcsetpgrp='undef'
 d_telldir='define'
-d_telldir64='undef'
 d_telldirproto='define'
 d_time='define'
 d_times='define'
-d_tmpfile64='undef'
 d_truncate='undef'
-d_truncate64='undef'
 d_tzname='undef'
 d_umask='define'
 d_uname='define'
 d_union_semun='define'
+d_vendorlib='undef'
 d_vfork='undef'
 d_void_closedir='undef'
 d_voidsig='define'
@@ -380,6 +373,7 @@ firstmakefile='makefile'
 flex=''
 fpostype='fpos_t'
 freetype='void'
+full_ar=''
 full_csh=''
 full_sed=''
 gccversion=''
@@ -416,12 +410,16 @@ i_mntent='undef'
 i_ndbm='undef'
 i_netdb='undef'
 i_neterrno='undef'
+i_netinettcp='undef'
 i_niin='undef'
 i_poll='undef'
+i_pthread='undef'
 i_pwd='undef'
 i_rpcsvcdbm='define'
 i_sfio='undef'
 i_sgtty='undef'
+i_shadow='undef'
+i_socks='undef'
 i_stdarg='define'
 i_stddef='define'
 i_stdlib='define'
@@ -465,13 +463,17 @@ installarchlib='~INST_TOP~~INST_VER~\lib~INST_ARCH~'
 installbin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 installman1dir='~INST_TOP~~INST_VER~\man\man1'
 installman3dir='~INST_TOP~~INST_VER~\man\man3'
+installprefix='~INST_TOP~~INST_VER~'
+installprefixexp='~INST_TOP~~INST_VER~'
 installhtmldir='~INST_TOP~~INST_VER~\html'
 installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp'
 installprivlib='~INST_TOP~~INST_VER~\lib'
 installscript='~INST_TOP~~INST_VER~\bin'
 installsitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
 installsitelib='~INST_TOP~\site~INST_VER~\lib'
+installstyle='lib'
 installusrbinperl='undef'
+installvendorlib=''
 intsize='4'
 known_extensions='DB_File Fcntl GDBM_File NDBM_File ODBM_File Opcode POSIX SDBM_File Socket IO attrs Thread'
 ksh=''
@@ -479,6 +481,7 @@ large=''
 ld='gcc'
 lddlflags='-mdll ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
+ldlibpthname=''
 less='less'
 lib_ext='.a'
 libc='libcrtdll.a'
@@ -557,6 +560,7 @@ pg=''
 phostname='hostname'
 pidtype='int'
 plibpth=''
+pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='~INST_TOP~'
@@ -573,6 +577,18 @@ rd_nodata='-1'
 rm='del'
 rmail=''
 runnm='true'
+sPRIEldbl='"E"'
+sPRIFldbl='"F"'
+sPRIGldbl='"G"'
+sPRIX64='"lX"'
+sPRId64='"ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"li"'
+sPRIo64='"lo"'
+sPRIu64='"lu"'
+sPRIx64='"lx"'
 sched_yield=''
 scriptdir='~INST_TOP~~INST_VER~\bin'
 scriptdirexp='~INST_TOP~~INST_VER~\bin'
@@ -588,6 +604,7 @@ shmattype='void *'
 shortsize='2'
 shrpenv=''
 shsharp='true'
+sig_count='26'
 sig_name='ZERO NUM01 INT QUIT ILL NUM05 NUM06 NUM07 FPE KILL NUM10 SEGV NUM12 PIPE ALRM TERM NUM16 NUM17 NUM18 NUM19 CHLD BREAK ABRT STOP NUM24 CONT CLD'
 sig_name_init='"ZERO", "NUM01", "INT", "QUIT", "ILL", "NUM05", "NUM06", "NUM07", "FPE", "KILL", "NUM10", "SEGV", "NUM12", "PIPE", "ALRM", "TERM", "NUM16", "NUM17", "NUM18", "NUM19", "CHLD", "BREAK", "ABRT", "STOP", "NUM24", "CONT", "CLD", 0'
 sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 20 0'
@@ -597,6 +614,8 @@ sitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
 sitearchexp='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
 sitelib='~INST_TOP~\site~INST_VER~\lib'
 sitelibexp='~INST_TOP~\site~INST_VER~\lib'
+siteprefix='~INST_TOP~\site~INST_VER~'
+siteprefixexp='~INST_TOP~\site~INST_VER~'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -619,6 +638,7 @@ stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
 stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
 strings='/usr/include/string.h'
 submit=''
 subversion='~SUBVERSION~'
@@ -634,11 +654,15 @@ touch='touch'
 tr=''
 trnl='\012'
 troff=''
+uidsign='-1'
 uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 use64bits='undef'
 usedl='define'
+uselargefiles='undef'
+uselongdouble='undef'
+usemorebits='undef'
 usemultiplicity='define'
 usemymalloc='n'
 usenm='false'
@@ -647,13 +671,26 @@ useperlio='undef'
 useposix='true'
 usesfio='false'
 useshrplib='yes'
+usesocks='undef'
 usethreads='undef'
+usevendorprefix='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
+vendorlib=''
+vendorlibexp=''
+vendorprefix=''
+vendorprefixexp=''
 version='~VERSION~'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
+xs_apiversion='5.00562'
 zcat=''
 zip='zip'
+PERL_REVISION='~PERL_REVISION~'
+PERL_VERSION='~PERL_VERSION~'
+PERL_SUBVERSION='~PERL_SUBVERSION~'
+PERL_APIVERSION='5.00562'
+PATCHLEVEL='~PERL_VERSION~'
+SUBVERSION='~PERL_SUBVERSION~'
diff --git a/win32/config.vc b/win32/config.vc
index 24603d87fd..cc7f50fbac 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -8,12 +8,8 @@ Id='$Id'
 Locker=''
 Log='$Log'
 Mcc='Mcc'
-PERL_VERSION='~PERL_VERSION~'
-PERL_SUBVERSION='~PERL_SUBVERSION~'
-PATCHLEVEL='~PERL_VERSION~'
 RCSfile='$RCSfile'
 Revision='$Revision'
-SUBVERSION='~PERL_SUBVERSION~'
 Source=''
 State=''
 _a='.lib'
@@ -34,6 +30,7 @@ awk='awk'
 baserev='5.0'
 bash=''
 bin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
+bincompat5005='undef'
 binexp='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 bison=''
 byacc='byacc'
@@ -71,13 +68,28 @@ crosscompile='undef'
 cryptlib=''
 csh='undef'
 d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEldbl='undef'
+d_PRIFldbl='undef'
+d_PRIGldbl='undef'
+d_PRIX64='undef'
+d_PRId64='undef'
+d_PRIeldbl='undef'
+d_PRIfldbl='undef'
+d_PRIgldbl='undef'
+d_PRIi64='undef'
+d_PRIo64='undef'
+d_PRIu64='undef'
+d_PRIx64='undef'
 d_access='define'
 d_accessx='undef'
 d_alarm='undef'
 d_archlib='define'
+d_atolf='undef'
+d_atoll='undef'
 d_attribut='undef'
 d_bcmp='undef'
 d_bcopy='undef'
+d_bincompat5005='undef'
 d_bsd='define'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='undef'
@@ -95,11 +107,7 @@ d_crypt='undef'
 d_csh='undef'
 d_cuserid='undef'
 d_dbl_dig='define'
-d_dbmclose64='undef'
-d_dbminit64='undef'
-d_delete64='undef'
 d_difftime='define'
-d_dirent64_s='undef'
 d_dirnamlen='define'
 d_dlerror='define'
 d_dlopen='define'
@@ -114,6 +122,7 @@ d_endnent='undef'
 d_endpent='undef'
 d_endpwent='undef'
 d_endsent='undef'
+d_endspent='undef'
 d_eofnblk='define'
 d_eunice='undef'
 d_fchmod='undef'
@@ -122,30 +131,18 @@ d_fcntl='undef'
 d_fd_macros='define'
 d_fd_set='define'
 d_fds_bits='define'
-d_fetch64='undef'
 d_fgetpos='define'
-d_fgetpos64='undef'
-d_firstkey64='undef'
 d_flexfnam='define'
 d_flock='define'
-d_flock64_s='undef'
-d_fopen64='undef'
 d_fork='undef'
 d_fpathconf='undef'
-d_freopen64='undef'
-d_fseek64='undef'
+d_fpos64_t='undef'
 d_fseeko='undef'
-d_fseeko64='undef'
 d_fsetpos='define'
-d_fsetpos64='undef'
-d_fstat64='undef'
 d_fstatfs='undef'
 d_fstatvfs='undef'
-d_ftell64='undef'
 d_ftello='undef'
-d_ftello64='undef'
 d_ftime='define'
-d_ftruncate64='undef'
 d_getgrent='undef'
 d_getgrps='undef'
 d_gethbyaddr='define'
@@ -154,6 +151,7 @@ d_gethent='undef'
 d_gethname='define'
 d_gethostprotos='define'
 d_getlogin='define'
+d_getmntent='undef'
 d_getnbyaddr='undef'
 d_getnbyname='undef'
 d_getnent='undef'
@@ -172,13 +170,15 @@ d_getsbyname='define'
 d_getsbyport='define'
 d_getsent='undef'
 d_getservprotos='define'
+d_getspent='undef'
+d_getspnam='undef'
 d_gettimeod='undef'
 d_grpasswd='undef'
+d_hasmntopt='undef'
 d_gnulibc='undef'
 d_htonl='define'
 d_index='undef'
 d_inetaton='undef'
-d_ino64t='undef'
 d_int64t='undef'
 d_iovec_s='undef'
 d_isascii='define'
@@ -186,18 +186,17 @@ d_killpg='undef'
 d_ldbl_dig='define'
 d_lchown='undef'
 d_link='undef'
+d_llseek='undef'
 d_locconv='define'
 d_lockf='undef'
-d_lockf64='undef'
 d_longdbl='define'
 d_longlong='undef'
-d_lseek64='undef'
 d_lstat='undef'
-d_lstat64='undef'
 d_madvise='undef'
 d_mblen='define'
 d_mbstowcs='define'
 d_mbtowc='define'
+d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
 d_memmove='define'
@@ -221,15 +220,12 @@ d_msgsnd='undef'
 d_msync='undef'
 d_munmap='undef'
 d_mymalloc='undef'
-d_nextkey64='undef'
 d_nice='undef'
-d_off64t='undef'
+d_off64_t='undef'
 d_old_pthread_create_joinable='undef'
 d_oldpthreads='undef'
 d_oldsock='undef'
 d_open3='undef'
-d_open64='undef'
-d_opendir64='undef'
 d_pathconf='undef'
 d_pause='define'
 d_phostname='undef'
@@ -246,10 +242,9 @@ d_pwgecos='undef'
 d_pwquota='undef'
 d_pwpasswd='undef'
 d_readdir='define'
-d_readdir64='undef'
 d_readlink='undef'
 d_readv='undef'
-d_recvmesg='undef'
+d_recvmsg='undef'
 d_rename='define'
 d_rewinddir='define'
 d_rmdir='define'
@@ -259,7 +254,6 @@ d_sanemcmp='define'
 d_sched_yield='undef'
 d_scm_rights='undef'
 d_seekdir='define'
-d_seekdir64='undef'
 d_select='define'
 d_sem='undef'
 d_semctl='undef'
@@ -290,6 +284,7 @@ d_setrgid='undef'
 d_setruid='undef'
 d_setsent='undef'
 d_setsid='undef'
+d_setspent='undef'
 d_setvbuf='define'
 d_sfio='undef'
 d_shm='undef'
@@ -302,16 +297,15 @@ d_sigaction='undef'
 d_sigsetjmp='undef'
 d_socket='define'
 d_sockpair='undef'
-d_stat64='undef'
 d_statblks='undef'
 d_statfs='undef'
 d_statfsflags='undef'
 d_statvfs='undef'
 d_stdio_cnt_lval='define'
 d_stdio_ptr_lval='define'
+d_stdio_stream_array='undef'
 d_stdiobase='define'
 d_stdstdio='define'
-d_store64='undef'
 d_strchr='define'
 d_strcoll='define'
 d_strctcpy='define'
@@ -320,6 +314,7 @@ d_strerror='define'
 d_strtod='define'
 d_strtol='define'
 d_strtoul='define'
+d_strtoull='undef'
 d_strxfrm='define'
 d_suidsafe='undef'
 d_symlink='undef'
@@ -331,17 +326,15 @@ d_system='define'
 d_tcgetpgrp='undef'
 d_tcsetpgrp='undef'
 d_telldir='define'
-d_telldir64='undef'
 d_telldirproto='define'
 d_time='define'
 d_times='define'
-d_tmpfile64='undef'
 d_truncate='undef'
-d_truncate64='undef'
 d_tzname='define'
 d_umask='define'
 d_uname='define'
 d_union_semun='define'
+d_vendorlib='undef'
 d_vfork='undef'
 d_void_closedir='undef'
 d_voidsig='define'
@@ -380,6 +373,7 @@ firstmakefile='makefile'
 flex=''
 fpostype='fpos_t'
 freetype='void'
+full_ar=''
 full_csh=''
 full_sed=''
 gccversion=''
@@ -416,12 +410,16 @@ i_mntent='undef'
 i_ndbm='undef'
 i_netdb='undef'
 i_neterrno='undef'
+i_netinettcp='undef'
 i_niin='undef'
 i_poll='undef'
+i_pthread='undef'
 i_pwd='undef'
 i_rpcsvcdbm='define'
 i_sfio='undef'
 i_sgtty='undef'
+i_shadow='undef'
+i_socks='undef'
 i_stdarg='define'
 i_stddef='define'
 i_stdlib='define'
@@ -465,13 +463,17 @@ installarchlib='~INST_TOP~~INST_VER~\lib~INST_ARCH~'
 installbin='~INST_TOP~~INST_VER~\bin~INST_ARCH~'
 installman1dir='~INST_TOP~~INST_VER~\man\man1'
 installman3dir='~INST_TOP~~INST_VER~\man\man3'
+installprefix='~INST_TOP~~INST_VER~'
+installprefixexp='~INST_TOP~~INST_VER~'
 installhtmldir='~INST_TOP~~INST_VER~\html'
 installhtmlhelpdir='~INST_TOP~~INST_VER~\htmlhelp'
 installprivlib='~INST_TOP~~INST_VER~\lib'
 installscript='~INST_TOP~~INST_VER~\bin'
 installsitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
 installsitelib='~INST_TOP~\site~INST_VER~\lib'
+installstyle='lib'
 installusrbinperl='undef'
+installvendorlib=''
 intsize='4'
 known_extensions='DB_File Fcntl GDBM_File NDBM_File ODBM_File Opcode POSIX SDBM_File Socket IO attrs Thread'
 ksh=''
@@ -479,6 +481,7 @@ large=''
 ld='link'
 lddlflags='-dll ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
+ldlibpthname=''
 less='less'
 lib_ext='.lib'
 libc='msvcrt.lib'
@@ -557,6 +560,7 @@ pg=''
 phostname='hostname'
 pidtype='int'
 plibpth=''
+pm_apiversion='5.005'
 pmake=''
 pr=''
 prefix='~INST_TOP~'
@@ -573,6 +577,18 @@ rd_nodata='-1'
 rm='del'
 rmail=''
 runnm='true'
+sPRIEldbl='"E"'
+sPRIFldbl='"F"'
+sPRIGldbl='"G"'
+sPRIX64='"lX"'
+sPRId64='"ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"li"'
+sPRIo64='"lo"'
+sPRIu64='"lu"'
+sPRIx64='"lx"'
 sched_yield=''
 scriptdir='~INST_TOP~~INST_VER~\bin'
 scriptdirexp='~INST_TOP~~INST_VER~\bin'
@@ -588,6 +604,7 @@ shmattype='void *'
 shortsize='2'
 shrpenv=''
 shsharp='true'
+sig_count='26'
 sig_name='ZERO NUM01 INT QUIT ILL NUM05 NUM06 NUM07 FPE KILL NUM10 SEGV NUM12 PIPE ALRM TERM NUM16 NUM17 NUM18 NUM19 CHLD BREAK ABRT STOP NUM24 CONT CLD'
 sig_name_init='"ZERO", "NUM01", "INT", "QUIT", "ILL", "NUM05", "NUM06", "NUM07", "FPE", "KILL", "NUM10", "SEGV", "NUM12", "PIPE", "ALRM", "TERM", "NUM16", "NUM17", "NUM18", "NUM19", "CHLD", "BREAK", "ABRT", "STOP", "NUM24", "CONT", "CLD", 0'
 sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 20 0'
@@ -597,6 +614,8 @@ sitearch='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
 sitearchexp='~INST_TOP~\site~INST_VER~\lib~INST_ARCH~'
 sitelib='~INST_TOP~\site~INST_VER~\lib'
 sitelibexp='~INST_TOP~\site~INST_VER~\lib'
+siteprefix='~INST_TOP~\site~INST_VER~'
+siteprefixexp='~INST_TOP~\site~INST_VER~'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -619,6 +638,7 @@ stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
 stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
 strings='/usr/include/string.h'
 submit=''
 subversion='~SUBVERSION~'
@@ -634,11 +654,15 @@ touch='touch'
 tr=''
 trnl='\012'
 troff=''
+uidsign='-1'
 uidtype='uid_t'
 uname='uname'
 uniq='uniq'
 use64bits='undef'
 usedl='define'
+uselargefiles='undef'
+uselongdouble='undef'
+usemorebits='undef'
 usemultiplicity='undef'
 usemymalloc='n'
 usenm='false'
@@ -647,13 +671,26 @@ useperlio='undef'
 useposix='true'
 usesfio='false'
 useshrplib='yes'
+usesocks='undef'
 usethreads='undef'
+usevendorprefix='undef'
 usevfork='false'
 usrinc='/usr/include'
 uuname=''
+vendorlib=''
+vendorlibexp=''
+vendorprefix=''
+vendorprefixexp=''
 version='~VERSION~'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
+xs_apiversion='5.00562'
 zcat=''
 zip='zip'
+PERL_REVISION='~PERL_REVISION~'
+PERL_VERSION='~PERL_VERSION~'
+PERL_SUBVERSION='~PERL_SUBVERSION~'
+PERL_APIVERSION='5.00562'
+PATCHLEVEL='~PERL_VERSION~'
+SUBVERSION='~PERL_SUBVERSION~'
diff --git a/win32/config_H.bc b/win32/config_H.bc
index 1fbe3b68d6..d4f8f664eb 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -13,7 +13,7 @@
 /*
  * Package name      : perl5
  * Source directory  : 
- * Configuration time: undef
+ * Configuration time: Mon Oct 11 21:25:14 1999
  * Configured by     : gsar
  * Target system     : 
  */
@@ -1488,7 +1488,7 @@
  *	This symbol contains the ~name expanded version of VENDORLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-/*#define PERL_VENDORLIB_EXP "undef"		/**/
+/*#define PERL_VENDORLIB_EXP ""		/**/
 
 /* OSNAME:
  *	This symbol contains the name of the operating system, as determined
@@ -1538,9 +1538,14 @@
  *	available directly to the user. Note that it may well be different from
  *	the preprocessor used to compile the C program.
  */
+/* CPPLAST:
+ *	This symbol is intended to be used along with CPPRUN in the same manner
+ *	symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "".
+ */
 #define CPPSTDIN "cpp32 -oCON"
 #define CPPMINUS ""
 #define CPPRUN "cpp32 -oCON"
+#define CPPLAST ""
 
 /* HAS_ACCESS:
  *	This manifest constant lets the C program know that the access()
@@ -1637,6 +1642,11 @@
  *	so that it is safe even if used by a process with super-user
  *	privileges.
  */
+/* HAS_PHOSTNAME:
+ *	This symbol, if defined, indicates that the C program may use the
+ *	contents of PHOSTNAME as a command to feed to the popen() routine
+ *	to derive the host name.
+ */
 #define HAS_GETHOSTNAME	/**/
 #define HAS_UNAME		/**/
 #undef HAS_PHOSTNAME
@@ -1759,7 +1769,7 @@
  *	This symbol, if defined, indicates that the memchr routine is available
  *	to locate characters within a C string.
  */
-/*#define HAS_MEMCHR	/**/
+#define HAS_MEMCHR	/**/
 
 /* HAS_MMAP:
  *	This symbol, if defined, indicates that the mmap system call is
@@ -2052,7 +2062,12 @@
  *	This symbol, if defined, indicates that <sys/uio.h> exists and
  *	should be included.
  */
+/* HAS_STRUCT_IOVEC:
+ *	This symbol, if defined, indicates that the struct iovec
+ *	to do scatter writes/gather reads is supported.
+ */
 /*#define	I_SYSUIO		/**/
+/*#define	HAS_STRUCT_IOVEC		/**/
 
 /* Free_t:
  *	This variable contains the return type of free().  It is usually
@@ -2378,8 +2393,8 @@
  *	This symbol, if defined, contains the string used by stdio to
  *	format long doubles (format 'g') for output.
  */
-/*#define PERL_PRIfldbl	undef	/**/
-/*#define PERL_PRIgldbl	undef	/**/
+/*#define PERL_PRIfldbl	"f"	/**/
+/*#define PERL_PRIgldbl	"g"	/**/
 
 /* PERL_PRId64:
  *	This symbol, if defined, contains the string used by stdio to
@@ -2397,10 +2412,10 @@
  *	This symbol, if defined, contains the string used by stdio to
  *	format 64-bit hexadecimal numbers (format 'x') for output.
  */
-/*#define PERL_PRId64	undef	/**/
-/*#define PERL_PRIu64	undef	/**/
-/*#define PERL_PRIo64	undef	/**/
-/*#define PERL_PRIx64	undef	/**/
+/*#define PERL_PRId64	"ld"	/**/
+/*#define PERL_PRIu64	"lu"	/**/
+/*#define PERL_PRIo64	"lo"	/**/
+/*#define PERL_PRIx64	"lx"	/**/
 
 /* SELECT_MIN_BITS:
  *	This symbol holds the minimum number of bits operated by select.
@@ -2427,7 +2442,7 @@
  *	Usual values include _iob, __iob, and __sF.
  */
 /*#define	HAS_STDIO_STREAM_ARRAY	/**/
-#define STDIO_STREAM_ARRAY	undef
+#define STDIO_STREAM_ARRAY	
 
 /* HAS_STRTOULL:
  *	This symbol, if defined, indicates that the strtoull routine is
@@ -2442,6 +2457,13 @@
  */
 /*#define	USE_64_BITS		/**/
 
+/* USE_LARGE_FILES:
+ *	This symbol, if defined, indicates that large file support
+ *	should be used when available.  The USE_64_BITS symbol will
+ *	also be turned on if necessary.
+ */
+/*#define	USE_LARGE_FILES		/**/
+
 /* USE_LONG_DOUBLE:
  *	This symbol, if defined, indicates that long doubles should
  *	be used when available.
@@ -2467,6 +2489,41 @@
  */
 /*#define	USE_SOCKS		/**/
 
+/* PERL_XS_APIVERSION:
+ *	This variable contains the version of the oldest perl binary
+ *	compatible with the present perl.  perl.c:incpush() and
+ *	lib/lib.pm will automatically search in c:\\perl\\site\\5.00562\\lib\\MSWin32-x86 for older
+ *	directories across major versions back to xs_apiversion.
+ *	This is only useful if you have a perl library directory tree
+ *	structured like the default one.
+ *	See INSTALL for how this works.
+ *	The versioned site_perl directory was introduced in 5.005,
+ *	so that is the lowest possible value.
+ *	Since this can depend on compile time options (such as
+ *	bincompat) it is set by Configure.  Other non-default sources
+ *	of potential incompatibility, such as multiplicity, threads,
+ *	debugging, 64bits, sfio, etc., are not checked for currently,
+ *	though in principle we could go snooping around in old
+ *	Config.pm files.
+ */
+/* PERL_PM_APIVERSION:
+ *	This variable contains the version of the oldest perl
+ *	compatible with the present perl.  (That is, pure perl modules
+ *	written for pm_apiversion will still work for the current
+ *	version).  perl.c:incpush() and lib/lib.pm will automatically
+ *	search in c:\\perl\\site\\5.00562\\lib for older directories across major versions
+ *	back to pm_apiversion.  This is only useful if you have a perl
+ *	library directory tree structured like the default one.  The
+ *	versioned site_perl library was introduced in 5.005, so that's
+ *	the default setting for this variable.  It's hard to imagine
+ *	it changing before Perl6.  It is included here for symmetry
+ *	with xs_apiveprsion -- the searching algorithms will
+ *	(presumably) be similar.
+ *	See the INSTALL file for how this works.
+ */
+#define PERL_XS_APIVERSION 5.00562 /* Change to string for tuples?*/
+#define PERL_PM_APIVERSION 5.005 /* Change to string for tuples?*/
+
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
@@ -2579,6 +2636,12 @@
  */
 /*#define   I_MACH_CTHREADS	/**/
 
+/* I_PTHREAD:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <pthread.h>.
+ */
+/*#define   I_PTHREAD	/**/
+
 /* USE_THREADS:
  *	This symbol, if defined, indicates that Perl should
  *	be built to use threads.
@@ -2654,6 +2717,12 @@
  */
 #define Size_t size_t	 /* length paramater for string functions */
 
+/* Uid_t_SIGN:
+ *	This symbol holds the signedess of a Uid_t.
+ *	1 for unsigned, -1 for signed.
+ */
+#define Uid_t_SIGN	-1		/* UID sign */
+
 /* Uid_t:
  *	This symbol holds the type used to declare user ids in the kernel.
  *	It can be int, ushort, uid_t, etc... It may be necessary to include
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 5bf69fa147..4dc26b1201 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -13,7 +13,7 @@
 /*
  * Package name      : perl5
  * Source directory  : 
- * Configuration time: undef
+ * Configuration time: Mon Oct 11 21:25:05 1999
  * Configured by     : gsar
  * Target system     : 
  */
@@ -1488,7 +1488,7 @@
  *	This symbol contains the ~name expanded version of VENDORLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-/*#define PERL_VENDORLIB_EXP "undef"		/**/
+/*#define PERL_VENDORLIB_EXP ""		/**/
 
 /* OSNAME:
  *	This symbol contains the name of the operating system, as determined
@@ -1538,9 +1538,14 @@
  *	available directly to the user. Note that it may well be different from
  *	the preprocessor used to compile the C program.
  */
+/* CPPLAST:
+ *	This symbol is intended to be used along with CPPRUN in the same manner
+ *	symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "".
+ */
 #define CPPSTDIN "gcc -E"
 #define CPPMINUS "-"
 #define CPPRUN "gcc -E"
+#define CPPLAST ""
 
 /* HAS_ACCESS:
  *	This manifest constant lets the C program know that the access()
@@ -1637,6 +1642,11 @@
  *	so that it is safe even if used by a process with super-user
  *	privileges.
  */
+/* HAS_PHOSTNAME:
+ *	This symbol, if defined, indicates that the C program may use the
+ *	contents of PHOSTNAME as a command to feed to the popen() routine
+ *	to derive the host name.
+ */
 #define HAS_GETHOSTNAME	/**/
 #define HAS_UNAME		/**/
 #undef HAS_PHOSTNAME
@@ -1759,7 +1769,7 @@
  *	This symbol, if defined, indicates that the memchr routine is available
  *	to locate characters within a C string.
  */
-/*#define HAS_MEMCHR	/**/
+#define HAS_MEMCHR	/**/
 
 /* HAS_MMAP:
  *	This symbol, if defined, indicates that the mmap system call is
@@ -2052,7 +2062,12 @@
  *	This symbol, if defined, indicates that <sys/uio.h> exists and
  *	should be included.
  */
+/* HAS_STRUCT_IOVEC:
+ *	This symbol, if defined, indicates that the struct iovec
+ *	to do scatter writes/gather reads is supported.
+ */
 /*#define	I_SYSUIO		/**/
+/*#define	HAS_STRUCT_IOVEC		/**/
 
 /* Free_t:
  *	This variable contains the return type of free().  It is usually
@@ -2378,8 +2393,8 @@
  *	This symbol, if defined, contains the string used by stdio to
  *	format long doubles (format 'g') for output.
  */
-/*#define PERL_PRIfldbl	undef	/**/
-/*#define PERL_PRIgldbl	undef	/**/
+/*#define PERL_PRIfldbl	"f"	/**/
+/*#define PERL_PRIgldbl	"g"	/**/
 
 /* PERL_PRId64:
  *	This symbol, if defined, contains the string used by stdio to
@@ -2397,10 +2412,10 @@
  *	This symbol, if defined, contains the string used by stdio to
  *	format 64-bit hexadecimal numbers (format 'x') for output.
  */
-/*#define PERL_PRId64	undef	/**/
-/*#define PERL_PRIu64	undef	/**/
-/*#define PERL_PRIo64	undef	/**/
-/*#define PERL_PRIx64	undef	/**/
+/*#define PERL_PRId64	"ld"	/**/
+/*#define PERL_PRIu64	"lu"	/**/
+/*#define PERL_PRIo64	"lo"	/**/
+/*#define PERL_PRIx64	"lx"	/**/
 
 /* SELECT_MIN_BITS:
  *	This symbol holds the minimum number of bits operated by select.
@@ -2427,7 +2442,7 @@
  *	Usual values include _iob, __iob, and __sF.
  */
 /*#define	HAS_STDIO_STREAM_ARRAY	/**/
-#define STDIO_STREAM_ARRAY	undef
+#define STDIO_STREAM_ARRAY	
 
 /* HAS_STRTOULL:
  *	This symbol, if defined, indicates that the strtoull routine is
@@ -2442,6 +2457,13 @@
  */
 /*#define	USE_64_BITS		/**/
 
+/* USE_LARGE_FILES:
+ *	This symbol, if defined, indicates that large file support
+ *	should be used when available.  The USE_64_BITS symbol will
+ *	also be turned on if necessary.
+ */
+/*#define	USE_LARGE_FILES		/**/
+
 /* USE_LONG_DOUBLE:
  *	This symbol, if defined, indicates that long doubles should
  *	be used when available.
@@ -2467,6 +2489,41 @@
  */
 /*#define	USE_SOCKS		/**/
 
+/* PERL_XS_APIVERSION:
+ *	This variable contains the version of the oldest perl binary
+ *	compatible with the present perl.  perl.c:incpush() and
+ *	lib/lib.pm will automatically search in c:\\perl\\site\\5.00562\\lib\\MSWin32-x86 for older
+ *	directories across major versions back to xs_apiversion.
+ *	This is only useful if you have a perl library directory tree
+ *	structured like the default one.
+ *	See INSTALL for how this works.
+ *	The versioned site_perl directory was introduced in 5.005,
+ *	so that is the lowest possible value.
+ *	Since this can depend on compile time options (such as
+ *	bincompat) it is set by Configure.  Other non-default sources
+ *	of potential incompatibility, such as multiplicity, threads,
+ *	debugging, 64bits, sfio, etc., are not checked for currently,
+ *	though in principle we could go snooping around in old
+ *	Config.pm files.
+ */
+/* PERL_PM_APIVERSION:
+ *	This variable contains the version of the oldest perl
+ *	compatible with the present perl.  (That is, pure perl modules
+ *	written for pm_apiversion will still work for the current
+ *	version).  perl.c:incpush() and lib/lib.pm will automatically
+ *	search in c:\\perl\\site\\5.00562\\lib for older directories across major versions
+ *	back to pm_apiversion.  This is only useful if you have a perl
+ *	library directory tree structured like the default one.  The
+ *	versioned site_perl library was introduced in 5.005, so that's
+ *	the default setting for this variable.  It's hard to imagine
+ *	it changing before Perl6.  It is included here for symmetry
+ *	with xs_apiveprsion -- the searching algorithms will
+ *	(presumably) be similar.
+ *	See the INSTALL file for how this works.
+ */
+#define PERL_XS_APIVERSION 5.00562 /* Change to string for tuples?*/
+#define PERL_PM_APIVERSION 5.005 /* Change to string for tuples?*/
+
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
@@ -2579,6 +2636,12 @@
  */
 /*#define   I_MACH_CTHREADS	/**/
 
+/* I_PTHREAD:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <pthread.h>.
+ */
+/*#define   I_PTHREAD	/**/
+
 /* USE_THREADS:
  *	This symbol, if defined, indicates that Perl should
  *	be built to use threads.
@@ -2654,6 +2717,12 @@
  */
 #define Size_t size_t	 /* length paramater for string functions */
 
+/* Uid_t_SIGN:
+ *	This symbol holds the signedess of a Uid_t.
+ *	1 for unsigned, -1 for signed.
+ */
+#define Uid_t_SIGN	-1		/* UID sign */
+
 /* Uid_t:
  *	This symbol holds the type used to declare user ids in the kernel.
  *	It can be int, ushort, uid_t, etc... It may be necessary to include
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 0d38044eb9..ffbb10feb8 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -13,7 +13,7 @@
 /*
  * Package name      : perl5
  * Source directory  : 
- * Configuration time: undef
+ * Configuration time: Mon Oct 11 21:24:59 1999
  * Configured by     : gsar
  * Target system     : 
  */
@@ -1488,7 +1488,7 @@
  *	This symbol contains the ~name expanded version of VENDORLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-/*#define PERL_VENDORLIB_EXP "undef"		/**/
+/*#define PERL_VENDORLIB_EXP ""		/**/
 
 /* OSNAME:
  *	This symbol contains the name of the operating system, as determined
@@ -1538,9 +1538,14 @@
  *	available directly to the user. Note that it may well be different from
  *	the preprocessor used to compile the C program.
  */
+/* CPPLAST:
+ *	This symbol is intended to be used along with CPPRUN in the same manner
+ *	symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "".
+ */
 #define CPPSTDIN "cl -nologo -E"
 #define CPPMINUS ""
 #define CPPRUN "cl -nologo -E"
+#define CPPLAST ""
 
 /* HAS_ACCESS:
  *	This manifest constant lets the C program know that the access()
@@ -1637,6 +1642,11 @@
  *	so that it is safe even if used by a process with super-user
  *	privileges.
  */
+/* HAS_PHOSTNAME:
+ *	This symbol, if defined, indicates that the C program may use the
+ *	contents of PHOSTNAME as a command to feed to the popen() routine
+ *	to derive the host name.
+ */
 #define HAS_GETHOSTNAME	/**/
 #define HAS_UNAME		/**/
 #undef HAS_PHOSTNAME
@@ -1759,7 +1769,7 @@
  *	This symbol, if defined, indicates that the memchr routine is available
  *	to locate characters within a C string.
  */
-/*#define HAS_MEMCHR	/**/
+#define HAS_MEMCHR	/**/
 
 /* HAS_MMAP:
  *	This symbol, if defined, indicates that the mmap system call is
@@ -2052,7 +2062,12 @@
  *	This symbol, if defined, indicates that <sys/uio.h> exists and
  *	should be included.
  */
+/* HAS_STRUCT_IOVEC:
+ *	This symbol, if defined, indicates that the struct iovec
+ *	to do scatter writes/gather reads is supported.
+ */
 /*#define	I_SYSUIO		/**/
+/*#define	HAS_STRUCT_IOVEC		/**/
 
 /* Free_t:
  *	This variable contains the return type of free().  It is usually
@@ -2378,8 +2393,8 @@
  *	This symbol, if defined, contains the string used by stdio to
  *	format long doubles (format 'g') for output.
  */
-/*#define PERL_PRIfldbl	undef	/**/
-/*#define PERL_PRIgldbl	undef	/**/
+/*#define PERL_PRIfldbl	"f"	/**/
+/*#define PERL_PRIgldbl	"g"	/**/
 
 /* PERL_PRId64:
  *	This symbol, if defined, contains the string used by stdio to
@@ -2397,10 +2412,10 @@
  *	This symbol, if defined, contains the string used by stdio to
  *	format 64-bit hexadecimal numbers (format 'x') for output.
  */
-/*#define PERL_PRId64	undef	/**/
-/*#define PERL_PRIu64	undef	/**/
-/*#define PERL_PRIo64	undef	/**/
-/*#define PERL_PRIx64	undef	/**/
+/*#define PERL_PRId64	"ld"	/**/
+/*#define PERL_PRIu64	"lu"	/**/
+/*#define PERL_PRIo64	"lo"	/**/
+/*#define PERL_PRIx64	"lx"	/**/
 
 /* SELECT_MIN_BITS:
  *	This symbol holds the minimum number of bits operated by select.
@@ -2427,7 +2442,7 @@
  *	Usual values include _iob, __iob, and __sF.
  */
 /*#define	HAS_STDIO_STREAM_ARRAY	/**/
-#define STDIO_STREAM_ARRAY	undef
+#define STDIO_STREAM_ARRAY	
 
 /* HAS_STRTOULL:
  *	This symbol, if defined, indicates that the strtoull routine is
@@ -2442,6 +2457,13 @@
  */
 /*#define	USE_64_BITS		/**/
 
+/* USE_LARGE_FILES:
+ *	This symbol, if defined, indicates that large file support
+ *	should be used when available.  The USE_64_BITS symbol will
+ *	also be turned on if necessary.
+ */
+/*#define	USE_LARGE_FILES		/**/
+
 /* USE_LONG_DOUBLE:
  *	This symbol, if defined, indicates that long doubles should
  *	be used when available.
@@ -2467,6 +2489,41 @@
  */
 /*#define	USE_SOCKS		/**/
 
+/* PERL_XS_APIVERSION:
+ *	This variable contains the version of the oldest perl binary
+ *	compatible with the present perl.  perl.c:incpush() and
+ *	lib/lib.pm will automatically search in c:\\perl\\site\\5.00562\\lib\\MSWin32-x86 for older
+ *	directories across major versions back to xs_apiversion.
+ *	This is only useful if you have a perl library directory tree
+ *	structured like the default one.
+ *	See INSTALL for how this works.
+ *	The versioned site_perl directory was introduced in 5.005,
+ *	so that is the lowest possible value.
+ *	Since this can depend on compile time options (such as
+ *	bincompat) it is set by Configure.  Other non-default sources
+ *	of potential incompatibility, such as multiplicity, threads,
+ *	debugging, 64bits, sfio, etc., are not checked for currently,
+ *	though in principle we could go snooping around in old
+ *	Config.pm files.
+ */
+/* PERL_PM_APIVERSION:
+ *	This variable contains the version of the oldest perl
+ *	compatible with the present perl.  (That is, pure perl modules
+ *	written for pm_apiversion will still work for the current
+ *	version).  perl.c:incpush() and lib/lib.pm will automatically
+ *	search in c:\\perl\\site\\5.00562\\lib for older directories across major versions
+ *	back to pm_apiversion.  This is only useful if you have a perl
+ *	library directory tree structured like the default one.  The
+ *	versioned site_perl library was introduced in 5.005, so that's
+ *	the default setting for this variable.  It's hard to imagine
+ *	it changing before Perl6.  It is included here for symmetry
+ *	with xs_apiveprsion -- the searching algorithms will
+ *	(presumably) be similar.
+ *	See the INSTALL file for how this works.
+ */
+#define PERL_XS_APIVERSION 5.00562 /* Change to string for tuples?*/
+#define PERL_PM_APIVERSION 5.005 /* Change to string for tuples?*/
+
 /* HAS_DRAND48_PROTO:
  *	This symbol, if defined, indicates that the system provides
  *	a prototype for the drand48() function.  Otherwise, it is up
@@ -2579,6 +2636,12 @@
  */
 /*#define   I_MACH_CTHREADS	/**/
 
+/* I_PTHREAD:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <pthread.h>.
+ */
+/*#define   I_PTHREAD	/**/
+
 /* USE_THREADS:
  *	This symbol, if defined, indicates that Perl should
  *	be built to use threads.
@@ -2654,6 +2717,12 @@
  */
 #define Size_t size_t	 /* length paramater for string functions */
 
+/* Uid_t_SIGN:
+ *	This symbol holds the signedess of a Uid_t.
+ *	1 for unsigned, -1 for signed.
+ */
+#define Uid_t_SIGN	-1		/* UID sign */
+
 /* Uid_t:
  *	This symbol holds the type used to declare user ids in the kernel.
  *	It can be int, ushort, uid_t, etc... It may be necessary to include
diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 3edc20bdac..a5c6c0dec8 100644
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -19,9 +19,13 @@ while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
 
 $opt{VERSION} = $];
 $opt{INST_VER} =~ s|~VERSION~|$]|g;
-if ($] =~ /\.(\d\d\d)?(\d\d)?$/) { # should always be true
-  $opt{PERL_VERSION} = int($1 || 0);
-  $opt{PERL_SUBVERSION} = $2 || '00';
+if ($] =~ /^(\d+)\.(\d\d\d)?(\d\d)?$/) { # should always be true
+  $opt{PERL_REVISION} = $1;
+  $opt{PERL_VERSION} = int($2 || 0);
+  $opt{PERL_SUBVERSION} = $3 || '00';
+}
+else {
+  die "Can't parse perl version ($])";
 }
 
 $opt{'cf_by'} = $ENV{USERNAME} unless $opt{'cf_by'};