Fixup after integrate:

 missed the .sym files that are changed by regen_headers
 sv.c and proto.h disagreed about pTHX_ ness of EXPECT_NUMBER.

p4raw-id: //depot/perlio@8496

diff --git a/global.sym b/global.sym
index 2f6f65b..48128c9 100644 (file)
--- a/global.sym
+++ b/global.sym
@@ -91,6 +91,7 @@ Perl_do_close
 Perl_do_join
 Perl_do_open
 Perl_do_open9
+Perl_do_openn
 Perl_dowantarray
 Perl_dump_all
 Perl_dump_eval

diff --git a/pp.sym b/pp.sym
index 2bd3922..db4e0dd 100644 (file)
--- a/pp.sym
+++ b/pp.sym
@@ -1,5 +1,5 @@
 #
-# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!! 
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
 #   This file is built by opcode.pl from its data.  Any changes made here
 #   will be lost!
 #

diff --git a/sv.c b/sv.c
index cccd2e9..70a45a3 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -6705,7 +6705,7 @@ Perl_sv_vsetpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 }
 
 I32
-S_expect_number(char** pattern)
+S_expect_number(pTHX_ char** pattern)
 {
     I32 var = 0;
     switch (**pattern) {
@@ -6717,7 +6717,7 @@ S_expect_number(char** pattern)
     }
     return var;
 }
-#define EXPECT_NUMBER(pattern, var) (var = S_expect_number(&pattern))
+#define EXPECT_NUMBER(pattern, var) (var = S_expect_number(aTHX_ &pattern))
 
 /*
 =for apidoc sv_vcatpvfn
@@ -7369,7 +7369,7 @@ Perl_sv_vcatpvfn(pTHX_ SV *sv, const char *pat, STRLEN patlen, va_list *args, SV
 #endif
                }
            }
-           else 
+           else
                sv_setuv_mg(argsv, (UV)i);
            continue;   /* not "break" */
 
@@ -8878,7 +8878,7 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags,
 
     if (proto_perl->Ipsig_pend) {
        Newz(0, PL_psig_pend, SIG_SIZE, int);
-    } 
+    }
     else {
        PL_psig_pend    = (int*)NULL;
     }