Regen headers for #6261 (and update embed.pl for this) and #6267,

silence few compiler warnings.

p4raw-id: //depot/cfgperl@6269

diff --git a/doop.c b/doop.c
index 4a74309..3394db2 100644 (file)
--- a/doop.c
+++ b/doop.c
@@ -89,7 +89,7 @@ S_do_trans_simple(pTHX_ SV *sv)
         }
     }
     *d='\0';
-    sv_setpvn(sv, dstart, d - dstart);
+    sv_setpvn(sv, (const char*)dstart, d - dstart);
     SvUTF8_on(sv);
     SvLEN_set(sv, 2*len+1);
     SvSETMAGIC(sv);
@@ -263,7 +263,7 @@ S_do_trans_simple_utf8(pTHX_ SV *sv)/* SPC - OK */
            s += UTF8SKIP(s);
     }
     *d = '\0';
-    sv_setpvn(sv, dstart, d - dstart);
+    sv_setpvn(sv, (const char*)dstart, d - dstart);
     SvSETMAGIC(sv);
     if (isutf)
         SvUTF8_on(sv);

diff --git a/embed.pl b/embed.pl
index 8efb189..b7cad10 100755 (executable)
--- a/embed.pl
+++ b/embed.pl
@@ -2470,6 +2470,7 @@ s |char*  |scan_trans     |char *start
 s      |char*  |scan_word      |char *s|char *dest|STRLEN destlen \
                                |int allow_package|STRLEN *slp
 s      |char*  |skipspace      |char *s
+s      |char*  |swallow_bom    |char *s
 s      |void   |checkcomma     |char *s|char *name|char *what
 s      |void   |force_ident    |char *s|int kind
 s      |void   |incline        |char *s

diff --git a/proto.h b/proto.h
index 0d70332..0746b11 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1009,6 +1009,7 @@ STATIC char*      S_gv_ename(pTHX_ GV *gv);
 STATIC void    S_cv_dump(pTHX_ CV *cv);
 STATIC CV*     S_cv_clone2(pTHX_ CV *proto, CV *outside);
 STATIC bool    S_scalar_mod_type(pTHX_ OP *o, I32 type);
+STATIC OP *    S_method_2entersub(pTHX_ OP *o, OP *o2, OP *svop);
 STATIC OP *    S_my_kid(pTHX_ OP *o, OP *attrs);
 STATIC OP *    S_dup_attrlist(pTHX_ OP *o);
 STATIC void    S_apply_attrs(pTHX_ HV *stash, SV *target, OP *attrs);
@@ -1218,6 +1219,7 @@ STATIC char*      S_scan_subst(pTHX_ char *start);
 STATIC char*   S_scan_trans(pTHX_ char *start);
 STATIC char*   S_scan_word(pTHX_ char *s, char *dest, STRLEN destlen, int allow_package, STRLEN *slp);
 STATIC char*   S_skipspace(pTHX_ char *s);
+STATIC char*   S_swallow_bom(pTHX_ char *s);
 STATIC void    S_checkcomma(pTHX_ char *s, char *name, char *what);
 STATIC void    S_force_ident(pTHX_ char *s, int kind);
 STATIC void    S_incline(pTHX_ char *s);