The binary compatibility notes say that new global functions should

go at the end. Not that I'm anything more than "trainee" when it
comes to this bincompat stuff.

p4raw-id: //depot/perl@21896

diff --git a/embed.fnc b/embed.fnc
index 52e3465..903a5e5 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -280,7 +280,6 @@ ApMd        |HE*    |hv_iternext_flags|HV* tb|I32 flags
 Apd    |SV*    |hv_iterval     |HV* tb|HE* entry
 Ap     |void   |hv_ksplit      |HV* hv|IV newmax
 Apd    |void   |hv_magic       |HV* hv|GV* gv|int how
-Apd    |SV*    |hv_scalar      |HV* hv|
 Apd    |SV**   |hv_store       |HV* tb|const char* key|I32 klen|SV* val \
                                |U32 hash
 Apd    |HE*    |hv_store_ent   |HV* tb|SV* key|SV* val|U32 hash
@@ -398,7 +397,6 @@ p   |int    |magic_nextpack |SV* sv|MAGIC* mg|SV* key
 p      |U32    |magic_regdata_cnt|SV* sv|MAGIC* mg
 p      |int    |magic_regdatum_get|SV* sv|MAGIC* mg
 p      |int    |magic_regdatum_set|SV* sv|MAGIC* mg
-p      |SV*    |magic_scalarpack|HV* hv|MAGIC* mg
 p      |int    |magic_set      |SV* sv|MAGIC* mg
 p      |int    |magic_setamagic|SV* sv|MAGIC* mg
 p      |int    |magic_setarylen|SV* sv|MAGIC* mg
@@ -1402,4 +1400,7 @@ sM        |HE*    |hv_fetch_common|HV* tb|SV* key_sv|const char* key|STRLEN klen|int flags
 
 Apd    |void   |hv_clear_placeholders|HV* hb
 
+Apd    |SV*    |hv_scalar      |HV* hv|
+p      |SV*    |magic_scalarpack|HV* hv|MAGIC* mg
+
 END_EXTERN_C

diff --git a/proto.h b/proto.h
index ac4c39a..3a14f7f 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -261,7 +261,6 @@ PERL_CALLCONV HE*   Perl_hv_iternext_flags(pTHX_ HV* tb, I32 flags);
 PERL_CALLCONV SV*      Perl_hv_iterval(pTHX_ HV* tb, HE* entry);
 PERL_CALLCONV void     Perl_hv_ksplit(pTHX_ HV* hv, IV newmax);
 PERL_CALLCONV void     Perl_hv_magic(pTHX_ HV* hv, GV* gv, int how);
-PERL_CALLCONV SV*      Perl_hv_scalar(pTHX_ HV* hv);
 PERL_CALLCONV SV**     Perl_hv_store(pTHX_ HV* tb, const char* key, I32 klen, SV* val, U32 hash);
 PERL_CALLCONV HE*      Perl_hv_store_ent(pTHX_ HV* tb, SV* key, SV* val, U32 hash);
 PERL_CALLCONV SV**     Perl_hv_store_flags(pTHX_ HV* tb, const char* key, I32 klen, SV* val, U32 hash, int flags);
@@ -377,7 +376,6 @@ PERL_CALLCONV int   Perl_magic_nextpack(pTHX_ SV* sv, MAGIC* mg, SV* key);
 PERL_CALLCONV U32      Perl_magic_regdata_cnt(pTHX_ SV* sv, MAGIC* mg);
 PERL_CALLCONV int      Perl_magic_regdatum_get(pTHX_ SV* sv, MAGIC* mg);
 PERL_CALLCONV int      Perl_magic_regdatum_set(pTHX_ SV* sv, MAGIC* mg);
-PERL_CALLCONV SV*      Perl_magic_scalarpack(pTHX_ HV* hv, MAGIC*      mg);
 PERL_CALLCONV int      Perl_magic_set(pTHX_ SV* sv, MAGIC* mg);
 PERL_CALLCONV int      Perl_magic_setamagic(pTHX_ SV* sv, MAGIC* mg);
 PERL_CALLCONV int      Perl_magic_setarylen(pTHX_ SV* sv, MAGIC* mg);
@@ -1343,4 +1341,7 @@ STATIC HE*        S_hv_fetch_common(pTHX_ HV* tb, SV* key_sv, const char* key, STRLEN k
 
 PERL_CALLCONV void     Perl_hv_clear_placeholders(pTHX_ HV* hb);
 
+PERL_CALLCONV SV*      Perl_hv_scalar(pTHX_ HV* hv);
+PERL_CALLCONV SV*      Perl_magic_scalarpack(pTHX_ HV* hv, MAGIC*      mg);
+
 END_EXTERN_C