Integrate:

[perl5.git] / sv.c

diff --git a/sv.c b/sv.c
index 7eba778..5efd546 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -8547,7 +8547,7 @@ F0convert(NV nv, char *endbuf, STRLEN *len)
        nv = -nv;
     if (nv < UV_MAX) {
        nv += 0.5;
-       uv = nv;
+       uv = (UV)nv;
        if (uv & 1 && uv == nv)
            uv--;                       /* Round to even */
        do {
@@ -8641,7 +8641,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
        pp = pat + 2;
        while (*pp >= '0' && *pp <= '9')
            digits = 10 * digits + (*pp++ - '0');
-       if (pp - pat == patlen - 1) {
+       if (pp - pat == (int)patlen - 1) {
            NV nv;
 
            if (args)
@@ -9140,7 +9140,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
                case 'V':  uv = va_arg(*args, UV); break;
                default:   uv = va_arg(*args, unsigned); break;
 #ifdef HAS_QUAD
-               case 'q':  uv = va_arg(*args, Quad_t); break;
+               case 'q':  uv = va_arg(*args, Uquad_t); break;
 #endif
                }
            }
@@ -10030,7 +10030,7 @@ S_gv_share(pTHX_ SV *sstr, CLONE_PARAMS *param)
         GvHV(gv) = (HV*)sv;
     }
     else {
-        SvREADONLY_on(GvAV(gv));
+        SvREADONLY_on(GvHV(gv));
     }
 
     return sstr; /* he_dup() will SvREFCNT_inc() */