Fix commented out function names in proto.h

From: "Jan Dubois" <jand@activestate.com>
Message-ID: <058b01c7c032$18a6a260$49f3e720$@com>

p4raw-id: //depot/perl@31546

diff --git a/embed.h b/embed.h
index 9c273fc..a8af4ba 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -1351,10 +1351,10 @@
 #define doform                 S_doform
 #endif
 #  if !defined(PERL_EFF_ACCESS) && defined(HAS_ACCESS) && (defined(HAS_SETREUID) || defined(HAS_SETRESUID) || defined(HAS_SETREGID) || defined(HAS_SETRESGID))
-#  endif
 #ifdef PERL_CORE
 #define emulate_eaccess                S_emulate_eaccess
 #endif
+#  endif
 #  if !defined(HAS_MKDIR) || !defined(HAS_RMDIR)
 #ifdef PERL_CORE
 #define dooneliner             S_dooneliner
@@ -3641,10 +3641,10 @@
 #define doform(a,b,c)          S_doform(aTHX_ a,b,c)
 #endif
 #  if !defined(PERL_EFF_ACCESS) && defined(HAS_ACCESS) && (defined(HAS_SETREUID) || defined(HAS_SETRESUID) || defined(HAS_SETREGID) || defined(HAS_SETRESGID))
-#  endif
 #ifdef PERL_CORE
 #define emulate_eaccess(a,b)   S_emulate_eaccess(aTHX_ a,b)
 #endif
+#  endif
 #  if !defined(HAS_MKDIR) || !defined(HAS_RMDIR)
 #ifdef PERL_CORE
 #define dooneliner(a,b)                S_dooneliner(aTHX_ a,b)

diff --git a/embed.pl b/embed.pl
index 5718561..f0af73c 100755 (executable)
--- a/embed.pl
+++ b/embed.pl
@@ -178,7 +178,7 @@ sub write_protos {
        }
        else {
            $retval = "PERL_CALLCONV $splint_flags$retval";
-           if ($flags =~ /p/) {
+           if ($flags =~ /[bp]/) {
                $func = "Perl_$func";
            }
        }

diff --git a/proto.h b/proto.h
index 13bd3c2..e67f028 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1838,7 +1838,7 @@ PERL_CALLCONV OP* Perl_pmtrans(pTHX_ OP* o, OP* expr, OP* repl)
 PERL_CALLCONV void     Perl_pop_scope(pTHX);
 PERL_CALLCONV OP*      Perl_prepend_elem(pTHX_ I32 optype, OP* head, OP* tail);
 PERL_CALLCONV void     Perl_push_scope(pTHX);
-/* PERL_CALLCONV OP*   ref(pTHX_ OP* o, I32 type); */
+/* PERL_CALLCONV OP*   Perl_ref(pTHX_ OP* o, I32 type); */
 PERL_CALLCONV OP*      Perl_refkids(pTHX_ OP* o, I32 type);
 PERL_CALLCONV void     Perl_regdump(pTHX_ const regexp* r)
                        __attribute__nonnull__(pTHX_1);
@@ -2171,7 +2171,7 @@ STATIC char*      S_glob_2pv(pTHX_ GV* const gv, STRLEN * const len)
                        __attribute__nonnull__(pTHX_1);
 
 #endif
-/* PERL_CALLCONV IV    sv_2iv(pTHX_ SV* sv)
+/* PERL_CALLCONV IV    Perl_sv_2iv(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV IV       Perl_sv_2iv_flags(pTHX_ SV* sv, I32 flags)
@@ -2181,7 +2181,7 @@ PERL_CALLCONV SV* Perl_sv_2mortal(pTHX_ SV* sv);
 PERL_CALLCONV NV       Perl_sv_2nv(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV char* sv_2pv(pTHX_ SV* sv, STRLEN* lp)
+/* PERL_CALLCONV char* Perl_sv_2pv(pTHX_ SV* sv, STRLEN* lp)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV char*    Perl_sv_2pv_flags(pTHX_ SV* sv, STRLEN* lp, I32 flags)
@@ -2196,7 +2196,7 @@ PERL_CALLCONV char*       Perl_sv_2pvbyte(pTHX_ SV* sv, STRLEN* lp)
 PERL_CALLCONV char*    Perl_sv_pvn_nomg(pTHX_ SV* sv, STRLEN* lp)
                        __attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV UV    sv_2uv(pTHX_ SV* sv)
+/* PERL_CALLCONV UV    Perl_sv_2uv(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV UV       Perl_sv_2uv_flags(pTHX_ SV* sv, I32 flags)
@@ -2247,11 +2247,11 @@ PERL_CALLCONV void      Perl_sv_catpv(pTHX_ SV* sv, const char* ptr)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 
-/* PERL_CALLCONV void  sv_catpvn(pTHX_ SV* sv, const char* ptr, STRLEN len)
+/* PERL_CALLCONV void  Perl_sv_catpvn(pTHX_ SV* sv, const char* ptr, STRLEN len)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2); */
 
-/* PERL_CALLCONV void  sv_catsv(pTHX_ SV* dsv, SV* ssv)
+/* PERL_CALLCONV void  Perl_sv_catsv(pTHX_ SV* dsv, SV* ssv)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV void     Perl_sv_chop(pTHX_ SV* sv, const char* ptr)
@@ -2348,7 +2348,7 @@ PERL_CALLCONV void        Perl_sv_pos_u2b(pTHX_ SV* sv, I32* offsetp, I32* lenp)
 PERL_CALLCONV void     Perl_sv_pos_b2u(pTHX_ SV* sv, I32* offsetp)
                        __attribute__nonnull__(pTHX_2);
 
-/* PERL_CALLCONV char* sv_pvn_force(pTHX_ SV* sv, STRLEN* lp)
+/* PERL_CALLCONV char* Perl_sv_pvn_force(pTHX_ SV* sv, STRLEN* lp)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV char*    Perl_sv_pvutf8n_force(pTHX_ SV* sv, STRLEN* lp)
@@ -2423,10 +2423,10 @@ PERL_CALLCONV void      Perl_sv_setpv(pTHX_ SV* sv, const char* ptr)
 PERL_CALLCONV void     Perl_sv_setpvn(pTHX_ SV* sv, const char* ptr, STRLEN len)
                        __attribute__nonnull__(pTHX_1);
 
-/* PERL_CALLCONV void  sv_setsv(pTHX_ SV* dsv, SV* ssv)
+/* PERL_CALLCONV void  Perl_sv_setsv(pTHX_ SV* dsv, SV* ssv)
                        __attribute__nonnull__(pTHX_1); */
 
-/* PERL_CALLCONV void  sv_taint(pTHX_ SV* sv)
+/* PERL_CALLCONV void  Perl_sv_taint(pTHX_ SV* sv)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV bool     Perl_sv_tainted(pTHX_ SV* sv)
@@ -2817,19 +2817,19 @@ PERL_CALLCONV void      Perl_reginitcolors(pTHX);
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1); */
 
-/* PERL_CALLCONV char* sv_pv(pTHX_ SV *sv)
+/* PERL_CALLCONV char* Perl_sv_pv(pTHX_ SV *sv)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1); */
 
-/* PERL_CALLCONV char* sv_pvutf8(pTHX_ SV *sv)
+/* PERL_CALLCONV char* Perl_sv_pvutf8(pTHX_ SV *sv)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1); */
 
-/* PERL_CALLCONV char* sv_pvbyte(pTHX_ SV *sv)
+/* PERL_CALLCONV char* Perl_sv_pvbyte(pTHX_ SV *sv)
                        __attribute__warn_unused_result__
                        __attribute__nonnull__(pTHX_1); */
 
-/* PERL_CALLCONV STRLEN        sv_utf8_upgrade(pTHX_ SV *sv)
+/* PERL_CALLCONV STRLEN        Perl_sv_utf8_upgrade(pTHX_ SV *sv)
                        __attribute__nonnull__(pTHX_1); */
 
 PERL_CALLCONV bool     Perl_sv_utf8_downgrade(pTHX_ SV *sv, bool fail_ok)
@@ -3644,10 +3644,10 @@ STATIC OP*      S_doform(pTHX_ CV *cv, GV *gv, OP *retop)
                        __attribute__nonnull__(pTHX_3);
 
 #  if !defined(PERL_EFF_ACCESS) && defined(HAS_ACCESS) && (defined(HAS_SETREUID) || defined(HAS_SETRESUID) || defined(HAS_SETREGID) || defined(HAS_SETRESGID))
-#  endif
 STATIC int     S_emulate_eaccess(pTHX_ const char* path, Mode_t mode)
                        __attribute__nonnull__(pTHX_1);
 
+#  endif
 #  if !defined(HAS_MKDIR) || !defined(HAS_RMDIR)
 STATIC int     S_dooneliner(pTHX_ const char *cmd, const char *filename)
                        __attribute__warn_unused_result__