4 files changed, 14 insertions, 5 deletions

diff --git a/Changes b/Changes
index 488a4433d1..0203e31449 100644
--- a/Changes
+++ b/Changes
@@ -78,6 +78,16 @@ Version 5.005_53        Development release working toward 5.006
 ----------------
 
 ____________________________________________________________________________
+[  2163] By: gsar                                  on 1998/10/31  11:31:12
+        Log: bump patchlevel; other minor fixes for clean build and test on
+             Solaris and win32
+     Branch: perl
+	   ! Changes ext/Data/Dumper/Dumper.xs patchlevel.h pp.h sv.c
+	   ! t/lib/dumper.t t/op/groups.t t/op/lex_assign.t
+	   ! t/pragma/warn/regexec win32/Makefile win32/config_H.bc
+	   ! win32/config_H.gc win32/config_H.vc win32/makefile.mk
+           ! x2p/a2p.c
+____________________________________________________________________________
 [  2162] By: gsar                                  on 1998/10/31  09:40:31
         Log: From: Ilya Zakharevich <ilya@math.ohio-state.edu>
              Date: Fri, 30 Oct 1998 18:36:20 -0500 (EST)
diff --git a/doop.c b/doop.c
index b88be261ad..2a032d90c5 100644
--- a/doop.c
+++ b/doop.c
@@ -653,8 +653,7 @@ do_join(register SV *sv, SV *del, register SV **mark, register SV **sp)
 
     mark++;
     len = (items > 0 ? (delimlen * (items - 1) ) : 0);
-    if (SvTYPE(sv) < SVt_PV)
-	sv_upgrade(sv, SVt_PV);
+    (void)SvUPGRADE(sv, SVt_PV);
     if (SvLEN(sv) < len + items) {	/* current length is way too short */
 	while (items-- > 0) {
 	    if (*mark && !SvGMAGICAL(*mark) && SvOK(*mark)) {
diff --git a/gv.c b/gv.c
index f4f0044c7f..94bf4991f5 100644
--- a/gv.c
+++ b/gv.c
@@ -712,7 +712,7 @@ gv_fetchpv(char *nambeg, I32 add, I32 sv_type)
 	if (len > 1)
 	    break;
 #ifdef COMPLEX_STATUS
-	sv_upgrade(GvSV(gv), SVt_PVLV);
+	(void)SvUPGRADE(GvSV(gv), SVt_PVLV);
 #endif
 	goto magicalize;
 
@@ -815,7 +815,7 @@ gv_fetchpv(char *nambeg, I32 add, I32 sv_type)
     case ']':
 	if (len == 1) {
 	    SV *sv = GvSV(gv);
-	    sv_upgrade(sv, SVt_PVNV);
+	    (void)SvUPGRADE(sv, SVt_PVNV);
 	    sv_setpv(sv, PL_patchlevel);
 	    (void)sv_2nv(sv);
 	    SvREADONLY_on(sv);
diff --git a/util.c b/util.c
index ffc2fd3633..6dead7a39a 100644
--- a/util.c
+++ b/util.c
@@ -905,7 +905,7 @@ fbm_compile(SV *sv, U32 flags /* not used yet */)
     U32 frequency = 256;
 
     s = (U8*)SvPV_force(sv, len);
-    sv_upgrade(sv, SVt_PVBM);
+    (void)SvUPGRADE(sv, SVt_PVBM);
     if (len > 255 || len == 0)	/* TAIL might be on on a zero-length string. */
 	return;			/* can't have offsets that big */
     if (len > 2) {