various tweaks for clean build and test on win32

p4raw-id: //depot/perl@2632

diff --git a/embed.h b/embed.h
index e90cc13..ef311c6 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -853,7 +853,6 @@
 #define scan_word              Perl_scan_word
 #define scope                  Perl_scope
 #define screaminstr            Perl_screaminstr
-#define seed                   Perl_seed
 #define setdefout              Perl_setdefout
 #define setenv_getix           Perl_setenv_getix
 #define share_hek              Perl_share_hek
@@ -2029,7 +2028,6 @@
 #define scope                  CPerlObj::Perl_scope
 #define screaminstr            CPerlObj::Perl_screaminstr
 #define seed                   CPerlObj::Perl_seed
-#define seed                   CPerlObj::Perl_seed
 #define set_csh                        CPerlObj::Perl_set_csh
 #define setdefout              CPerlObj::Perl_setdefout
 #define setenv_getix           CPerlObj::Perl_setenv_getix

diff --git a/ext/B/Makefile.PL b/ext/B/Makefile.PL
index d7aaa01..35cc6bf 100644 (file)
--- a/ext/B/Makefile.PL
+++ b/ext/B/Makefile.PL
@@ -30,7 +30,7 @@ sub post_constants {
 
 sub postamble {
 '
-B.o : defsubs.h 
+B$(OBJ_EXT) : defsubs.h 
 '
 }
 

diff --git a/global.sym b/global.sym
index ff966b3..0c6eece 100644 (file)
--- a/global.sym
+++ b/global.sym
@@ -500,7 +500,6 @@ scan_trans
 scan_word
 scope
 screaminstr
-seed
 setdefout
 setenv_getix
 share_hek

diff --git a/lib/FindBin.pm b/lib/FindBin.pm
index b9aeb36..1a2bb22 100644 (file)
--- a/lib/FindBin.pm
+++ b/lib/FindBin.pm
@@ -74,7 +74,7 @@ package FindBin;
 use Carp;
 require 5.000;
 require Exporter;
-use File::Spec qw(file_name_is_absolute);
+use File::Spec;
 use Cwd qw(getcwd abs_path);
 use Config;
 use File::Basename;
@@ -142,7 +142,7 @@ BEGIN
 
      # Ensure $script contains the complete path incase we C<chdir>
 
-     $script = getcwd() . "/" . $script unless file_name_is_absolute($script);
+     $script = getcwd() . "/" . $script unless File::Spec->file_name_is_absolute($script);
 
      ($Script,$Bin) = fileparse($script);
 
@@ -154,7 +154,7 @@ BEGIN
        ($RealScript,$RealBin) = fileparse($script);
        last unless defined $linktext;
 
-       $script = (file_name_is_absolute($linktext))
+       $script = (File::Spec->file_name_is_absolute($linktext))
                   ? $linktext
                   : $RealBin . "/" . $linktext;
       }

diff --git a/objXSUB.h b/objXSUB.h
index a0cbf78..97845f8 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -2853,8 +2853,6 @@
 #define screaminstr            pPerl->Perl_screaminstr
 #undef  seed
 #define seed                   pPerl->Perl_seed
-#undef  seed
-#define seed                   pPerl->Perl_seed
 #undef  set_csh
 #define set_csh                        pPerl->Perl_set_csh
 #undef  setdefout

diff --git a/op.c b/op.c
index d50324a..035247b 100644 (file)
--- a/op.c
+++ b/op.c
@@ -5050,7 +5050,7 @@ ck_sort(OP *o)
 #endif
 
     if (o->op_flags & OPf_STACKED)
-           simplify_sort(o);
+       simplify_sort(o);
     if (o->op_flags & OPf_STACKED) {                /* may have been cleared */
        OP *kid = cLISTOPo->op_first->op_sibling;       /* get past pushmark */
        OP *k;
@@ -5096,6 +5096,7 @@ ck_sort(OP *o)
 STATIC void
 simplify_sort(OP *o)
 {
+    dTHR;
     register OP *kid = cLISTOPo->op_first->op_sibling; /* get past pushmark */
     OP *k;
     int reversed;

diff --git a/t/pragma/warn/doio b/t/pragma/warn/doio
index 41ac89a..993c34d 100644 (file)
--- a/t/pragma/warn/doio
+++ b/t/pragma/warn/doio
@@ -104,11 +104,11 @@ use warning 'io' ;
 exec "lskdjfalksdjfdjfkls","" ;
 EXPECT
 OPTION regex
-Can't exec "lskdjfalksdjfdjfkls": (\w+ )?(No such file or directory|A file or directory in the path name does not exist)
+Can't exec "lskdjfalksdjfdjfkls": .+ at - line 3.
 ########
 # doio.c
 use warning 'io' ;
 exec "lskdjfalksdjfdjfkls", "abc" ;
 EXPECT
 OPTION regex
-Can't exec "lskdjfalksdjfdjfkls": (\w+ )?(No such file or directory|A file or directory in the path name does not exist)
+Can't exec "lskdjfalksdjfdjfkls": .+ at - line 3.