X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=sv.c;h=add445bfef3fbbd9e98fa60689b799a22cd66328;hb=be26652545762cccb4c0118f022cf9d0ec20cf93;hp=c885bb22b7e380a846c569d53e2f8e77bd1be521;hpb=300aed98347df4b3587b6ffdf7817ba6640f2e5e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/sv.c b/sv.c
index c885bb2..add445b 100644
--- a/sv.c
+++ b/sv.c
@@ -3941,7 +3941,7 @@ Perl_sv_eq(pTHX_ register SV *str1, register SV *str2)
     if (cur1) {
 	if (!str2)
 	    return 0;
-	if (SvUTF8(str1) != SvUTF8(str2)) {
+	if (SvUTF8(str1) != SvUTF8(str2) && !IN_BYTE) {
 	    if (SvUTF8(str1)) {
 		sv_utf8_upgrade(str2);
 	    }
@@ -5953,11 +5953,6 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 	    break;
 	}
 
-#ifdef USE_64_BIT_INT
-	if (!intsize)
-	    intsize = 'q';
-#endif
-
 	/* CONVERSION */
 
 	switch (c = *q++) {
@@ -6087,7 +6082,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 		iv = (svix < svmax) ? SvIVx(svargs[svix++]) : 0;
 		switch (intsize) {
 		case 'h':	iv = (short)iv; break;
-		default:	iv = (int)iv; break;
+		default:	break;
 		case 'l':	iv = (long)iv; break;
 		case 'V':	break;
 #ifdef HAS_QUAD
@@ -6169,7 +6164,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 		uv = (svix < svmax) ? SvUVx(svargs[svix++]) : 0;
 		switch (intsize) {
 		case 'h':	uv = (unsigned short)uv; break;
-		default:	uv = (unsigned)uv; break;
+		default:	break;
 		case 'l':	uv = (unsigned long)uv; break;
 		case 'V':	break;
 #ifdef HAS_QUAD
@@ -7888,6 +7883,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
     }
     else {
 	init_stacks();
+	ENTER;			/* perl_destruct() wants to LEAVE; */
     }
 
     PL_start_env	= proto_perl->Tstart_env;	/* XXXXXX */