Change 30051 by [EMAIL PROTECTED] on 2007/01/28 21:56:48
Integrate:
[ 28626]
Clear up most of the VC6 compiler warnings in the following smoke:
http://www.nntp.perl.org/group/perl.daily-build.reports/39733
Affected files ...
... //depot/maint-5.8/perl/ext/B/B.xs#24 integrate
... //depot/maint-5.8/perl/ext/XS/APItest/APItest.xs#16 integrate
... //depot/maint-5.8/perl/hv.c#109 integrate
... //depot/maint-5.8/perl/op.c#189 integrate
... //depot/maint-5.8/perl/pp.c#133 integrate
... //depot/maint-5.8/perl/pp_pack.c#55 integrate
... //depot/maint-5.8/perl/utf8.c#77 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/B/B.xs#24 (text) ====
Index: perl/ext/B/B.xs
--- perl/ext/B/B.xs#23~29929~ 2007-01-22 15:29:42.000000000 -0800
+++ perl/ext/B/B.xs 2007-01-28 13:56:48.000000000 -0800
@@ -1086,7 +1086,7 @@
COP_warnings(o)
B::COP o
-B::SV
+void
COP_io(o)
B::COP o
==== //depot/maint-5.8/perl/ext/XS/APItest/APItest.xs#16 (text) ====
Index: perl/ext/XS/APItest/APItest.xs
--- perl/ext/XS/APItest/APItest.xs#15~30038~ 2007-01-27 10:13:24.000000000
-0800
+++ perl/ext/XS/APItest/APItest.xs 2007-01-28 13:56:48.000000000 -0800
@@ -180,7 +180,6 @@
SV *
test_share_unshare_pvn(input)
PREINIT:
- SV *output;
STRLEN len;
U32 hash;
char *pvx;
==== //depot/maint-5.8/perl/op.c#189 (text) ====
Index: perl/op.c
--- perl/op.c#188~30048~ 2007-01-27 16:08:17.000000000 -0800
+++ perl/op.c 2007-01-28 13:56:48.000000000 -0800
@@ -2200,7 +2200,7 @@
assert(sv);
if (type == OP_RV2GV)
return newGVOP(OP_GV, 0, (GV*)sv);
- return newSVOP(OP_CONST, 0, sv);
+ return newSVOP(OP_CONST, 0, (SV*)sv);
nope:
return o;
==== //depot/maint-5.8/perl/pp_pack.c#55 (text) ====
Index: perl/pp_pack.c
--- perl/pp_pack.c#54~30040~ 2007-01-27 10:56:32.000000000 -0800
+++ perl/pp_pack.c 2007-01-28 13:56:48.000000000 -0800
@@ -3075,7 +3075,7 @@
#ifdef PERL_PACK_CAN_W
case 'W': {
char *end;
- U8 in_bytes = IN_BYTES;
+ U8 in_bytes = (U8)IN_BYTES;
end = start+SvLEN(cat)-1;
if (utf8) end -= UTF8_MAXLEN-1;
==== //depot/maint-5.8/perl/utf8.c#77 (text) ====
Index: perl/utf8.c
--- perl/utf8.c#76~30040~ 2007-01-27 10:56:32.000000000 -0800
+++ perl/utf8.c 2007-01-28 13:56:48.000000000 -0800
@@ -1721,6 +1721,7 @@
return (tmps[off] << 24) + (tmps[off+1] << 16) + (tmps[off+2] << 8) +
tmps[off + 3] ;
}
Perl_croak(aTHX_ "panic: swash_fetch got swatch of unexpected bit width");
+ NORETURN_FUNCTION_END;
}
/* Note:
End of Patch.
