Change 20068 by [EMAIL PROTECTED] on 2003/07/08 08:36:27

        Subject: [PATCH: maint @ 20046] warnings, line numbers & windows
        From: Marcus Holland-Moritz <[EMAIL PROTECTED]>
        Date: Tue, 8 Jul 2003 11:14:05 +0200 (MEST)
        Message-ID: <[EMAIL PROTECTED]>

Affected files ...

... //depot/perl/ext/B/B.xs#84 edit
... //depot/perl/lib/Pod/Text/Termcap.pm#14 edit
... //depot/perl/mg.c#271 edit
... //depot/perl/op.c#575 edit

Differences ...

==== //depot/perl/ext/B/B.xs#84 (text) ====
Index: perl/ext/B/B.xs
--- perl/ext/B/B.xs#83~19916~   Tue Jul  1 09:51:31 2003
+++ perl/ext/B/B.xs     Tue Jul  8 01:36:27 2003
@@ -976,7 +976,7 @@
 COP_arybase(o)
        B::COP  o
 
-U16
+U32
 COP_line(o)
        B::COP  o
 
@@ -1331,7 +1331,7 @@
 GvCVGEN(gv)
        B::GV   gv
 
-U16
+U32
 GvLINE(gv)
        B::GV   gv
 

==== //depot/perl/lib/Pod/Text/Termcap.pm#14 (text) ====
Index: perl/lib/Pod/Text/Termcap.pm
--- perl/lib/Pod/Text/Termcap.pm#13~17544~      Mon Jul 15 05:57:52 2002
+++ perl/lib/Pod/Text/Termcap.pm        Tue Jul  8 01:36:27 2003
@@ -44,8 +44,10 @@
     my ($ospeed, $term, $termios);
 
     # The default Term::Cap path won't work on Solaris.
-    $ENV{TERMPATH} = "$ENV{HOME}/.termcap:/etc/termcap"
-        . ":/usr/share/misc/termcap:/usr/share/lib/termcap";
+    # $ENV{HOME} is usually not set on MSWin32.
+    my $home = exists $ENV{HOME} ? "$ENV{HOME}/.termcap:" : '';
+    $ENV{TERMPATH} = $home . '/etc/termcap:/usr/share/misc/termcap'
+                           . ':/usr/share/lib/termcap';
 
     # Fall back on a hard-coded terminal speed if POSIX::Termios isn't
     # available (such as on VMS).

==== //depot/perl/mg.c#271 (text) ====
Index: perl/mg.c
--- perl/mg.c#270~19943~        Wed Jul  2 23:27:18 2003
+++ perl/mg.c   Tue Jul  8 01:36:27 2003
@@ -2375,7 +2375,7 @@
 #endif
        /* PL_origalen is set in perl_parse(). */
        s = SvPV_force(sv,len);
-       if (len >= (I32)PL_origalen) {
+       if (len >= (STRLEN)PL_origalen) {
            /* Longer than original, will be truncated. */
            Copy(s, PL_origargv[0], PL_origalen, char);
            PL_origargv[0][PL_origalen - 1] = 0;

==== //depot/perl/op.c#575 (text) ====
Index: perl/op.c
--- perl/op.c#574~19841~        Sun Jun 22 09:35:33 2003
+++ perl/op.c   Tue Jul  8 01:36:27 2003
@@ -2676,7 +2676,7 @@
        OP *curop;
        if (pm->op_pmflags & PMf_EVAL) {
            curop = 0;
-           if (CopLINE(PL_curcop) < PL_multi_end)
+           if (CopLINE(PL_curcop) < (line_t)PL_multi_end)
                CopLINE_set(PL_curcop, (line_t)PL_multi_end);
        }
        else if (repl->op_type == OP_CONST)
End of Patch.

Reply via email to