Change 29801 by [EMAIL PROTECTED] on 2007/01/13 23:40:49
Integrate:
[ 26598]
silence some compiler warnings
[ 26608]
Fix release mode builds following change 26598
[ 26633]
Silence compiler warning; ref change 26598
Affected files ...
... //depot/maint-5.8/perl/cop.h#24 edit
... //depot/maint-5.8/perl/op.c#153 integrate
... //depot/maint-5.8/perl/toke.c#125 integrate
Differences ...
==== //depot/maint-5.8/perl/cop.h#24 (text) ====
Index: perl/cop.h
--- perl/cop.h#23~29800~ 2007-01-13 15:25:42.000000000 -0800
+++ perl/cop.h 2007-01-13 15:40:49.000000000 -0800
@@ -47,6 +47,7 @@
? GvSV(gv_fetchfile(CopFILE(c))) : NULL)
# define CopFILEAV(c) (CopFILE(c) \
? GvAV(gv_fetchfile(CopFILE(c))) : NULL)
+# define CopFILEAVx(c) (GvAV(gv_fetchfile(CopFILE(c))))
# define CopSTASHPV(c) ((c)->cop_stashpv)
# ifdef NETWARE
@@ -72,6 +73,7 @@
# define CopFILE_set(c,pv) CopFILEGV_set((c), gv_fetchfile(pv))
# define CopFILESV(c) (CopFILEGV(c) ? GvSV(CopFILEGV(c)) : NULL)
# define CopFILEAV(c) (CopFILEGV(c) ? GvAV(CopFILEGV(c)) : NULL)
+# define CopFILEAVx(c) (GvAV(CopFILEGV(c)))
# define CopFILE(c) (CopFILESV(c) ? SvPVX(CopFILESV(c)) : NULL)
# define CopSTASH(c) ((c)->cop_stash)
# define CopSTASH_set(c,hv) ((c)->cop_stash = (hv))
==== //depot/maint-5.8/perl/op.c#153 (text) ====
Index: perl/op.c
--- perl/op.c#152~29798~ 2007-01-13 14:58:25.000000000 -0800
+++ perl/op.c 2007-01-13 15:40:49.000000000 -0800
@@ -3600,7 +3600,7 @@
CopSTASH_set(cop, PL_curstash);
if (PERLDB_LINE && PL_curstash != PL_debstash) {
- SV * const * const svp = av_fetch(CopFILEAV(PL_curcop),
(I32)CopLINE(cop), FALSE);
+ SV * const * const svp = av_fetch(CopFILEAVx(PL_curcop),
(I32)CopLINE(cop), FALSE);
if (svp && *svp != &PL_sv_undef ) {
(void)SvIOK_on(*svp);
SvIV_set(*svp, PTR2IV(cop));
==== //depot/maint-5.8/perl/toke.c#125 (text) ====
Index: perl/toke.c
--- perl/toke.c#124~29794~ 2007-01-13 11:26:17.000000000 -0800
+++ perl/toke.c 2007-01-13 15:40:49.000000000 -0800
@@ -830,7 +830,7 @@
sv_setpvn(sv,PL_bufptr,PL_bufend-PL_bufptr);
(void)SvIOK_on(sv);
SvIV_set(sv, 0);
- av_store(CopFILEAV(PL_curcop),(I32)CopLINE(PL_curcop),sv);
+ av_store(CopFILEAVx(PL_curcop),(I32)CopLINE(PL_curcop),sv);
}
}
}
@@ -2725,7 +2725,7 @@
sv_setsv(sv,PL_linestr);
(void)SvIOK_on(sv);
SvIV_set(sv, 0);
- av_store(CopFILEAV(PL_curcop),(I32)CopLINE(PL_curcop),sv);
+ av_store(CopFILEAVx(PL_curcop),(I32)CopLINE(PL_curcop),sv);
}
goto retry;
}
@@ -2812,7 +2812,7 @@
sv_setsv(sv,PL_linestr);
(void)SvIOK_on(sv);
SvIV_set(sv, 0);
- av_store(CopFILEAV(PL_curcop),(I32)CopLINE(PL_curcop),sv);
+ av_store(CopFILEAVx(PL_curcop),(I32)CopLINE(PL_curcop),sv);
}
PL_bufend = SvPVX(PL_linestr) + SvCUR(PL_linestr);
PL_last_lop = PL_last_uni = NULL;
@@ -3764,7 +3764,7 @@
t++;
Perl_warner(aTHX_ packWARN(WARN_SYNTAX),
"Multidimensional syntax %.*s not
supported",
- (t - PL_bufptr) + 1, PL_bufptr);
+ (int)((t - PL_bufptr) + 1), PL_bufptr);
}
}
}
@@ -3864,7 +3864,8 @@
PL_bufptr = skipspace(PL_bufptr);
Perl_warner(aTHX_ packWARN(WARN_SYNTAX),
"Scalar value %.*s better written as $%.*s",
- t-PL_bufptr, PL_bufptr, t-PL_bufptr-1, PL_bufptr+1);
+ (int)(t-PL_bufptr), PL_bufptr,
+ (int)(t-PL_bufptr-1), PL_bufptr+1);
}
}
}
@@ -9686,7 +9687,7 @@
sv_setsv(sv,PL_linestr);
(void)SvIOK_on(sv);
SvIV_set(sv, 0);
- av_store(CopFILEAV(PL_curcop), (I32)CopLINE(PL_curcop),sv);
+ av_store(CopFILEAVx(PL_curcop), (I32)CopLINE(PL_curcop),sv);
}
if (*s == term && memEQ(s,PL_tokenbuf,len)) {
STRLEN off = PL_bufend - 1 - SvPVX_const(PL_linestr);
@@ -10158,7 +10159,7 @@
sv_setsv(sv,PL_linestr);
(void)SvIOK_on(sv);
SvIV_set(sv, 0);
- av_store(CopFILEAV(PL_curcop), (I32)CopLINE(PL_curcop), sv);
+ av_store(CopFILEAVx(PL_curcop), (I32)CopLINE(PL_curcop), sv);
}
/* having changed the buffer, we must update PL_bufend */
End of Patch.
