diff options
| -rw-r--r-- | embed.fnc | 6 | ||||
| -rw-r--r-- | embed.h | 16 | ||||
| -rw-r--r-- | global.sym | 2 | ||||
| -rw-r--r-- | mro.c | 9 | ||||
| -rw-r--r-- | proto.h | 6 |
5 files changed, 25 insertions, 14 deletions
@@ -1880,8 +1880,10 @@ p |struct mro_meta* |mro_meta_init |NN HV* stash p |struct mro_meta* |mro_meta_dup |NN struct mro_meta* smeta|NN CLONE_PARAMS* param #endif Apd |AV* |mro_get_linear_isa|NN HV* stash -Apd |AV* |mro_get_linear_isa_c3|NN HV* stash|I32 level -Apd |AV* |mro_get_linear_isa_dfs|NN HV* stash|I32 level +#if defined(PERL_IN_MRO_C) || defined(PERL_DECL_PROT) +sd |AV* |mro_get_linear_isa_c3|NN HV* stash|I32 level +sd |AV* |mro_get_linear_isa_dfs|NN HV* stash|I32 level +#endif pd |void |mro_isa_changed_in|NN HV* stash Apd |void |mro_method_changed_in |NN HV* stash p |void |boot_core_mro @@ -1911,8 +1911,12 @@ #endif #endif #define mro_get_linear_isa Perl_mro_get_linear_isa -#define mro_get_linear_isa_c3 Perl_mro_get_linear_isa_c3 -#define mro_get_linear_isa_dfs Perl_mro_get_linear_isa_dfs +#if defined(PERL_IN_MRO_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define mro_get_linear_isa_c3 S_mro_get_linear_isa_c3 +#define mro_get_linear_isa_dfs S_mro_get_linear_isa_dfs +#endif +#endif #ifdef PERL_CORE #define mro_isa_changed_in Perl_mro_isa_changed_in #endif @@ -4207,8 +4211,12 @@ #endif #endif #define mro_get_linear_isa(a) Perl_mro_get_linear_isa(aTHX_ a) -#define mro_get_linear_isa_c3(a,b) Perl_mro_get_linear_isa_c3(aTHX_ a,b) -#define mro_get_linear_isa_dfs(a,b) Perl_mro_get_linear_isa_dfs(aTHX_ a,b) +#if defined(PERL_IN_MRO_C) || defined(PERL_DECL_PROT) +#ifdef PERL_CORE +#define mro_get_linear_isa_c3(a,b) S_mro_get_linear_isa_c3(aTHX_ a,b) +#define mro_get_linear_isa_dfs(a,b) S_mro_get_linear_isa_dfs(aTHX_ a,b) +#endif +#endif #ifdef PERL_CORE #define mro_isa_changed_in(a) Perl_mro_isa_changed_in(aTHX_ a) #endif diff --git a/global.sym b/global.sym index 7b0a18b3e9..fa18d27d63 100644 --- a/global.sym +++ b/global.sym @@ -761,7 +761,5 @@ Perl_signbit Perl_emulate_cop_io Perl_get_re_arg Perl_mro_get_linear_isa -Perl_mro_get_linear_isa_c3 -Perl_mro_get_linear_isa_dfs Perl_mro_method_changed_in # ex: set ro: @@ -21,6 +21,7 @@ These functions are related to the method resolution order of perl classes */ #include "EXTERN.h" +#define PERL_IN_MRO_C #include "perl.h" struct mro_meta* @@ -83,8 +84,8 @@ invalidated). =cut */ -AV* -Perl_mro_get_linear_isa_dfs(pTHX_ HV *stash, I32 level) +static AV* +S_mro_get_linear_isa_dfs(pTHX_ HV *stash, I32 level) { AV* retval; GV** gvp; @@ -197,8 +198,8 @@ invalidated). =cut */ -AV* -Perl_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) +static AV* +S_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) { AV* retval; GV** gvp; @@ -4697,12 +4697,14 @@ PERL_CALLCONV struct mro_meta* Perl_mro_meta_dup(pTHX_ struct mro_meta* smeta, C PERL_CALLCONV AV* Perl_mro_get_linear_isa(pTHX_ HV* stash) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV AV* Perl_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) +#if defined(PERL_IN_MRO_C) || defined(PERL_DECL_PROT) +STATIC AV* S_mro_get_linear_isa_c3(pTHX_ HV* stash, I32 level) __attribute__nonnull__(pTHX_1); -PERL_CALLCONV AV* Perl_mro_get_linear_isa_dfs(pTHX_ HV* stash, I32 level) +STATIC AV* S_mro_get_linear_isa_dfs(pTHX_ HV* stash, I32 level) __attribute__nonnull__(pTHX_1); +#endif PERL_CALLCONV void Perl_mro_isa_changed_in(pTHX_ HV* stash) __attribute__nonnull__(pTHX_1); |