diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2000-05-04 17:30:22 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2000-05-04 17:30:22 +0000 |
| commit | 9067b776a4619539a10a21959139776c500bc1c0 (patch) | |
| tree | 63373a56909cfd46b8c9abeb7ebe8969c187a209 /sv.c | |
| parent | aa40b8036a409ed6ba1e685fc83e99888b654b9d (diff) | |
| parent | be28567c7b4a66645fbbd71964c8c6819169207c (diff) | |
| download | perl-9067b776a4619539a10a21959139776c500bc1c0.tar.gz | |
Integrate with Sarathy.
p4raw-id: //depot/cfgperl@6065
Diffstat (limited to 'sv.c')
| -rw-r--r-- | sv.c | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -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 |