summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pp_sys.c12
-rw-r--r--sv.c9
2 files changed, 8 insertions, 13 deletions
diff --git a/pp_sys.c b/pp_sys.c
index ca7fbed313..461f6f7015 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -4085,14 +4085,14 @@ PP(pp_gmtime)
SV *tsv;
if (!tmbuf)
RETPUSHUNDEF;
- tsv = Perl_newSVpvf(aTHX_ "%s %s %2"IVdf" %02"IVdf":%02"IVdf":%02"IVdf" %"IVdf,
+ tsv = Perl_newSVpvf(aTHX_ "%s %s %2d %02d:%02d:%02d %d",
dayname[tmbuf->tm_wday],
monname[tmbuf->tm_mon],
- (IV)tmbuf->tm_mday,
- (IV)tmbuf->tm_hour,
- (IV)tmbuf->tm_min,
- (IV)tmbuf->tm_sec,
- (IV)tmbuf->tm_year + 1900);
+ tmbuf->tm_mday,
+ tmbuf->tm_hour,
+ tmbuf->tm_min,
+ tmbuf->tm_sec,
+ tmbuf->tm_year + 1900);
PUSHs(sv_2mortal(tsv));
}
else if (tmbuf) {
diff --git a/sv.c b/sv.c
index e76e40ffe5..9780450efe 100644
--- a/sv.c
+++ b/sv.c
@@ -5935,11 +5935,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++) {
@@ -6069,7 +6064,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
@@ -6151,7 +6146,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