Change 11972 by sky@sky-titanic on 2001/09/10 11:54:25
Silence some more warnings INT2PTR.
Affected files ...
... //depot/perl/pp.c#303 edit
... //depot/perl/pp_ctl.c#282 edit
... //depot/perl/sharedsv.c#4 edit
... //depot/perl/sv.c#466 edit
... //depot/perl/taint.c#25 edit
Differences ...
==== //depot/perl/pp.c#303 (text) ====
Index: perl/pp.c
--- perl/pp.c.~1~ Mon Sep 10 06:00:05 2001
+++ perl/pp.c Mon Sep 10 06:00:05 2001
@@ -4199,7 +4199,7 @@
if (pm->op_pmreplroot) {
#ifdef USE_ITHREADS
- ary = GvAVn((GV*)PL_curpad[(PADOFFSET)pm->op_pmreplroot]);
+ ary = GvAVn((GV*)PL_curpad[INT2PTR(PADOFFSET, pm->op_pmreplroot)]);
#else
ary = GvAVn((GV*)pm->op_pmreplroot);
#endif
==== //depot/perl/pp_ctl.c#282 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c.~1~ Mon Sep 10 06:00:05 2001
+++ perl/pp_ctl.c Mon Sep 10 06:00:05 2001
@@ -1779,7 +1779,7 @@
SAVESPTR(*svp);
#else
SAVEPADSV(PL_op->op_targ);
- iterdata = (void*)PL_op->op_targ;
+ iterdata = INT2PTR(void*, PL_op->op_targ);
cxtype |= CXp_PADVAR;
#endif
}
==== //depot/perl/sharedsv.c#4 (text) ====
Index: perl/sharedsv.c
--- perl/sharedsv.c.~1~ Mon Sep 10 06:00:05 2001
+++ perl/sharedsv.c Mon Sep 10 06:00:05 2001
@@ -171,7 +171,7 @@
switch (SvTYPE(sv)) {
case SVt_RV:
if (SvROK(sv))
- Perl_sharedsv_thrcnt_dec(aTHX_ (shared_sv *)SvIV(SvRV(sv)));
+ Perl_sharedsv_thrcnt_dec(aTHX_ INT2PTR(shared_sv *, SvIV(SvRV(sv))));
break;
case SVt_PVAV: {
SV **src_ary = AvARRAY((AV *)sv);
@@ -179,7 +179,7 @@
while (items-- > 0) {
if(SvTYPE(*src_ary))
- Perl_sharedsv_thrcnt_dec(aTHX_ (shared_sv *)SvIV(*src_ary++));
+ Perl_sharedsv_thrcnt_dec(aTHX_ INT2PTR(shared_sv *,
+SvIV(*src_ary++)));
}
break;
}
@@ -188,7 +188,7 @@
(void)hv_iterinit((HV *)sv);
while ((entry = hv_iternext((HV *)sv)))
Perl_sharedsv_thrcnt_dec(
- aTHX_ (shared_sv *)SvIV(hv_iterval((HV *)sv, entry))
+ aTHX_ INT2PTR(shared_sv *, SvIV(hv_iterval((HV *)sv, entry)))
);
break;
}
==== //depot/perl/sv.c#466 (text) ====
Index: perl/sv.c
--- perl/sv.c.~1~ Mon Sep 10 06:00:05 2001
+++ perl/sv.c Mon Sep 10 06:00:05 2001
@@ -9799,8 +9799,8 @@
for(i = 0; i <= len; i++) {
av_push(PL_regex_padav,
SvREFCNT_inc(
- newSViv((IV)re_dup((REGEXP *)
- SvIVX(regexen[i]), param))
+ newSViv(PTR2IV(re_dup(INT2PTR(REGEXP *,
+ SvIVX(regexen[i])), param)))
));
}
}
==== //depot/perl/taint.c#25 (text) ====
Index: perl/taint.c
--- perl/taint.c.~1~ Mon Sep 10 06:00:05 2001
+++ perl/taint.c Mon Sep 10 06:00:05 2001
@@ -15,7 +15,7 @@
#ifdef HAS_SETEUID
DEBUG_u(PerlIO_printf(Perl_debug_log,
- "%s %d %"Uid_t_f" %"Uid_t_f"\n", s, PL_tainted, PL_uid, PL_euid));
+ "%s %d %"Uid_t_f" %"Uid_t_f"\n", s, PL_tainted, (long unsigned
+int)PL_uid, (long unsigned int)PL_euid));
#endif
if (PL_tainted) {
End of Patch.