Update Changes.

[p5sagit/p5-mst-13.2.git] / sv.c

diff --git a/sv.c b/sv.c
index e193bc5..acb0b82 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -2961,8 +2961,11 @@ void
 Perl_sv_setpvn(pTHX_ register SV *sv, register const char *ptr, register STRLEN len)
 {
     register char *dptr;
-    assert(len >= 0);  /* STRLEN is probably unsigned, so this may
-                         elicit a warning, but it won't hurt. */
+    {
+        /* len is STRLEN which is unsigned, need to copy to signed */
+       IV iv = len;
+       assert(iv >= 0);
+    }
     SV_CHECK_THINKFIRST(sv);
     if (!ptr) {
        (void)SvOK_off(sv);
@@ -4006,7 +4009,7 @@ Perl_sv_len_utf8(pTHX_ register SV *sv)
        STRLEN len;
        U8 *s = (U8*)SvPV(sv, len);
 
-       return Perl_utf8_length(s, s + len);
+       return Perl_utf8_length(aTHX_ s, s + len);
     }
 }
 
@@ -5134,7 +5137,7 @@ Perl_sv_reset(pTHX_ register char *s, HV *stash)
                }
                if (GvHV(gv) && !HvNAME(GvHV(gv))) {
                    hv_clear(GvHV(gv));
-#if !defined( VMS) && !defined(EPOC)  /* VMS has no environ array */
+#ifdef USE_ENVIRON_ARRAY
                    if (gv == PL_envgv)
                        environ[0] = Nullch;
 #endif