From efd0b058b26702bef38cdb6ce1a9da02e3e7cf89 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Mon, 1 Dec 2008 21:28:13 +0000 Subject: [PATCH] Convention seems to be that static definitions are also made visible by || defined(PERL_DECL_PROT), so add this where it is missing. p4raw-id: //depot/perl@34972 --- embed.fnc | 28 ++++++++++++++-------------- embed.h | 56 ++++++++++++++++++++++++++++---------------------------- proto.h | 28 ++++++++++++++-------------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/embed.fnc b/embed.fnc index b0aeea1..2ecd5e1 100644 --- a/embed.fnc +++ b/embed.fnc @@ -217,7 +217,7 @@ p |void |deprecate |NN const char *const s : Used in various files p |void |deprecate_old |NN const char *const s Afp |OP* |die |NULLOK const char* pat|... -#if defined(PERL_IN_UTIL_C) +#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) s |OP* |vdie |NULLOK const char* pat|NULLOK va_list* args #endif : Used in util.c @@ -249,7 +249,7 @@ Ap |int |do_spawn_nowait|NN char* cmd p |bool |do_exec3 |NN const char *incmd|int fd|int do_report #endif p |void |do_execfree -#ifdef PERL_IN_DOIO_C +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) s |void |exec_failed |NN const char *cmd|int fd|int do_report #endif #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) @@ -319,7 +319,7 @@ ApdR |char* |fbm_instr |NN unsigned char* big|NN unsigned char* bigend \ : Defined in util.c, used only in perl.c p |char* |find_script |NN const char *scriptname|bool dosearch \ |NULLOK const char *const *const search_ext|I32 flags -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) s |OP* |force_list |NULLOK OP* arg : FIXME s |OP* |fold_constants |NN OP *o @@ -327,7 +327,7 @@ s |OP* |fold_constants |NN OP *o Afpd |char* |form |NN const char* pat|... Ap |char* |vform |NN const char* pat|NULLOK va_list* args Ap |void |free_tmps -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) s |OP* |gen_constant_list|NULLOK OP* o #endif #if !defined(HAS_GETENV_LEN) @@ -427,7 +427,7 @@ ApP |I32 |ibcmp_locale |NN const char* a|NN const char* b|I32 len Apd |I32 |ibcmp_utf8 |NN const char *s1|NULLOK char **pe1|UV l1 \ |bool u1|NN const char *s2|NULLOK char **pe2 \ |UV l2|bool u2 -#if defined(PERL_IN_DOIO_C) +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) sR |bool |ingroup |Gid_t testgid|bool effective #endif : Used in toke.c @@ -513,7 +513,7 @@ Ap |void |op_null |NN OP* o EXp |void |op_clear |NN OP* o Ap |void |op_refcnt_lock Ap |void |op_refcnt_unlock -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) s |OP* |linklist |NN OP *o s |OP* |listkids |NULLOK OP* o #endif @@ -748,7 +748,7 @@ pd |void |pad_leavemy Apd |SV* |pad_sv |PADOFFSET po : Defined in pad.c, used only in op.c pd |void |pad_free |PADOFFSET po -#if defined(PERL_IN_PAD_C) +#if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT) sd |void |pad_reset #endif : Used in op.c @@ -795,7 +795,7 @@ s |void |pidgone |Pid_t pid|int status Ap |void |pmflag |NN U32* pmfl|int ch : Used in perly.y p |OP* |pmruntime |NN OP *o|NN OP *expr|bool isreg -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) s |OP* |pmtrans |NN OP* o|NN OP* expr|NN OP* repl #endif Ap |void |pop_scope @@ -803,7 +803,7 @@ Ap |void |pop_scope p |OP* |prepend_elem |I32 optype|NULLOK OP* head|NULLOK OP* tail Ap |void |push_scope Amb |OP* |ref |NULLOK OP* o|I32 type -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) s |OP* |refkids |NULLOK OP* o|I32 type #endif Ap |void |regdump |NN const regexp* r @@ -865,7 +865,7 @@ p |int |rsignal_restore|int i|NULLOK Sigsave_t* t : Used in pp_sys.c p |int |rsignal_save |int i|Sighandler_t t1|NN Sigsave_t* save Ap |Sighandler_t|rsignal_state|int i -#if defined(PERL_IN_PP_CTL_C) +#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) s |void |rxres_free |NN void** rsp s |void |rxres_restore |NN void **rsp|NN REGEXP *rx #endif @@ -937,7 +937,7 @@ s |void |save_pushptri32ptr|NULLOK void *const ptr1|const I32 i \ p |OP* |sawparens |NULLOK OP* o : Used in perly.y p |OP* |scalar |NULLOK OP* o -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) s |OP* |scalarkids |NULLOK OP* o s |OP* |scalarseq |NULLOK OP* o #endif @@ -969,7 +969,7 @@ Apd |bool |sv_2bool |NN SV *const sv Apd |CV* |sv_2cv |NULLOK SV* sv|NN HV **const st|NN GV **const gvp \ |const I32 lref Apd |IO* |sv_2io |NN SV *const sv -#ifdef PERL_IN_SV_C +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) s |bool |glob_2number |NN GV* const gv s |char* |glob_2pv |NN GV* const gv|NULLOK STRLEN * const len #endif @@ -993,7 +993,7 @@ Apd |char* |sv_pvn |NN SV *sv|NN STRLEN *lp Apd |char* |sv_pvutf8n |NN SV *sv|NN STRLEN *lp Apd |char* |sv_pvbyten |NN SV *sv|NN STRLEN *lp Apd |I32 |sv_true |NULLOK SV *const sv -#if defined (PERL_IN_SV_C) +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) sd |void |sv_add_arena |NN char *const ptr|const U32 size \ |const U32 flags #endif @@ -1915,7 +1915,7 @@ ApR |PerlIO *|PerlIO_stderr : Only used in dump.c p |void |deb_stack_all -#ifdef PERL_IN_DEB_C +#if defined(PERL_IN_DEB_C) || defined(PERL_DECL_PROT) s |void |deb_stack_n |NN SV** stack_base|I32 stack_min \ |I32 stack_max|I32 mark_min|I32 mark_max #endif diff --git a/embed.h b/embed.h index 886f26b..1b1ee2e1 100644 --- a/embed.h +++ b/embed.h @@ -156,7 +156,7 @@ #define deprecate_old Perl_deprecate_old #endif #define die Perl_die -#if defined(PERL_IN_UTIL_C) +#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define vdie S_vdie #endif @@ -195,7 +195,7 @@ #ifdef PERL_CORE #define do_execfree Perl_do_execfree #endif -#ifdef PERL_IN_DOIO_C +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define exec_failed S_exec_failed #endif @@ -249,7 +249,7 @@ #ifdef PERL_CORE #define find_script Perl_find_script #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define force_list S_force_list #define fold_constants S_fold_constants @@ -258,7 +258,7 @@ #define form Perl_form #define vform Perl_vform #define free_tmps Perl_free_tmps -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define gen_constant_list S_gen_constant_list #endif @@ -312,7 +312,7 @@ #define ibcmp Perl_ibcmp #define ibcmp_locale Perl_ibcmp_locale #define ibcmp_utf8 Perl_ibcmp_utf8 -#if defined(PERL_IN_DOIO_C) +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define ingroup S_ingroup #endif @@ -403,7 +403,7 @@ #endif #define op_refcnt_lock Perl_op_refcnt_lock #define op_refcnt_unlock Perl_op_refcnt_unlock -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define linklist S_linklist #define listkids S_listkids @@ -640,7 +640,7 @@ #ifdef PERL_CORE #define pad_free Perl_pad_free #endif -#if defined(PERL_IN_PAD_C) +#if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define pad_reset S_pad_reset #endif @@ -689,7 +689,7 @@ #ifdef PERL_CORE #define pmruntime Perl_pmruntime #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define pmtrans S_pmtrans #endif @@ -699,7 +699,7 @@ #define prepend_elem Perl_prepend_elem #endif #define push_scope Perl_push_scope -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define refkids S_refkids #endif @@ -752,7 +752,7 @@ #define rsignal_save Perl_rsignal_save #endif #define rsignal_state Perl_rsignal_state -#if defined(PERL_IN_PP_CTL_C) +#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define rxres_free S_rxres_free #define rxres_restore S_rxres_restore @@ -822,7 +822,7 @@ #define sawparens Perl_sawparens #define scalar Perl_scalar #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define scalarkids S_scalarkids #define scalarseq S_scalarseq @@ -860,7 +860,7 @@ #define sv_2bool Perl_sv_2bool #define sv_2cv Perl_sv_2cv #define sv_2io Perl_sv_2io -#ifdef PERL_IN_SV_C +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define glob_2number S_glob_2number #define glob_2pv S_glob_2pv @@ -884,7 +884,7 @@ #define sv_pvutf8n Perl_sv_pvutf8n #define sv_pvbyten Perl_sv_pvbyten #define sv_true Perl_sv_true -#if defined (PERL_IN_SV_C) +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define sv_add_arena S_sv_add_arena #endif @@ -1686,7 +1686,7 @@ #ifdef PERL_CORE #define deb_stack_all Perl_deb_stack_all #endif -#ifdef PERL_IN_DEB_C +#if defined(PERL_IN_DEB_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define deb_stack_n S_deb_stack_n #endif @@ -2494,7 +2494,7 @@ #define deprecate(a) Perl_deprecate(aTHX_ a) #define deprecate_old(a) Perl_deprecate_old(aTHX_ a) #endif -#if defined(PERL_IN_UTIL_C) +#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define vdie(a,b) S_vdie(aTHX_ a,b) #endif @@ -2535,7 +2535,7 @@ #ifdef PERL_CORE #define do_execfree() Perl_do_execfree(aTHX) #endif -#ifdef PERL_IN_DOIO_C +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define exec_failed(a,b,c) S_exec_failed(aTHX_ a,b,c) #endif @@ -2589,7 +2589,7 @@ #ifdef PERL_CORE #define find_script(a,b,c,d) Perl_find_script(aTHX_ a,b,c,d) #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define force_list(a) S_force_list(aTHX_ a) #define fold_constants(a) S_fold_constants(aTHX_ a) @@ -2597,7 +2597,7 @@ #endif #define vform(a,b) Perl_vform(aTHX_ a,b) #define free_tmps() Perl_free_tmps(aTHX) -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define gen_constant_list(a) S_gen_constant_list(aTHX_ a) #endif @@ -2663,7 +2663,7 @@ #define ibcmp(a,b,c) Perl_ibcmp(aTHX_ a,b,c) #define ibcmp_locale(a,b,c) Perl_ibcmp_locale(aTHX_ a,b,c) #define ibcmp_utf8(a,b,c,d,e,f,g,h) Perl_ibcmp_utf8(aTHX_ a,b,c,d,e,f,g,h) -#if defined(PERL_IN_DOIO_C) +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define ingroup(a,b) S_ingroup(aTHX_ a,b) #endif @@ -2754,7 +2754,7 @@ #endif #define op_refcnt_lock() Perl_op_refcnt_lock(aTHX) #define op_refcnt_unlock() Perl_op_refcnt_unlock(aTHX) -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define linklist(a) S_linklist(aTHX_ a) #define listkids(a) S_listkids(aTHX_ a) @@ -2988,7 +2988,7 @@ #ifdef PERL_CORE #define pad_free(a) Perl_pad_free(aTHX_ a) #endif -#if defined(PERL_IN_PAD_C) +#if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define pad_reset() S_pad_reset(aTHX) #endif @@ -3036,7 +3036,7 @@ #ifdef PERL_CORE #define pmruntime(a,b,c) Perl_pmruntime(aTHX_ a,b,c) #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define pmtrans(a,b,c) S_pmtrans(aTHX_ a,b,c) #endif @@ -3046,7 +3046,7 @@ #define prepend_elem(a,b,c) Perl_prepend_elem(aTHX_ a,b,c) #endif #define push_scope() Perl_push_scope(aTHX) -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define refkids(a,b) S_refkids(aTHX_ a,b) #endif @@ -3099,7 +3099,7 @@ #define rsignal_save(a,b,c) Perl_rsignal_save(aTHX_ a,b,c) #endif #define rsignal_state(a) Perl_rsignal_state(aTHX_ a) -#if defined(PERL_IN_PP_CTL_C) +#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define rxres_free(a) S_rxres_free(aTHX_ a) #define rxres_restore(a,b) S_rxres_restore(aTHX_ a,b) @@ -3173,7 +3173,7 @@ #define sawparens(a) Perl_sawparens(aTHX_ a) #define scalar(a) Perl_scalar(aTHX_ a) #endif -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define scalarkids(a) S_scalarkids(aTHX_ a) #define scalarseq(a) S_scalarseq(aTHX_ a) @@ -3211,7 +3211,7 @@ #define sv_2bool(a) Perl_sv_2bool(aTHX_ a) #define sv_2cv(a,b,c,d) Perl_sv_2cv(aTHX_ a,b,c,d) #define sv_2io(a) Perl_sv_2io(aTHX_ a) -#ifdef PERL_IN_SV_C +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define glob_2number(a) S_glob_2number(aTHX_ a) #define glob_2pv(a,b) S_glob_2pv(aTHX_ a,b) @@ -3235,7 +3235,7 @@ #define sv_pvutf8n(a,b) Perl_sv_pvutf8n(aTHX_ a,b) #define sv_pvbyten(a,b) Perl_sv_pvbyten(aTHX_ a,b) #define sv_true(a) Perl_sv_true(aTHX_ a) -#if defined (PERL_IN_SV_C) +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define sv_add_arena(a,b,c) S_sv_add_arena(aTHX_ a,b,c) #endif @@ -4047,7 +4047,7 @@ #ifdef PERL_CORE #define deb_stack_all() Perl_deb_stack_all(aTHX) #endif -#ifdef PERL_IN_DEB_C +#if defined(PERL_IN_DEB_C) || defined(PERL_DECL_PROT) #ifdef PERL_CORE #define deb_stack_n(a,b,c,d,e) S_deb_stack_n(aTHX_ a,b,c,d,e) #endif diff --git a/proto.h b/proto.h index a2ed234..768738c 100644 --- a/proto.h +++ b/proto.h @@ -532,7 +532,7 @@ PERL_CALLCONV void Perl_deprecate_old(pTHX_ const char *const s) PERL_CALLCONV OP* Perl_die(pTHX_ const char* pat, ...) __attribute__format__null_ok__(__printf__,pTHX_1,pTHX_2); -#if defined(PERL_IN_UTIL_C) +#if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT) STATIC OP* S_vdie(pTHX_ const char* pat, va_list* args); #endif PERL_CALLCONV OP* Perl_die_where(pTHX_ const char* message, STRLEN msglen); @@ -607,7 +607,7 @@ PERL_CALLCONV bool Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report) #endif PERL_CALLCONV void Perl_do_execfree(pTHX); -#ifdef PERL_IN_DOIO_C +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) STATIC void S_exec_failed(pTHX_ const char *cmd, int fd, int do_report) __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_EXEC_FAILED \ @@ -794,7 +794,7 @@ PERL_CALLCONV char* Perl_find_script(pTHX_ const char *scriptname, bool dosearch #define PERL_ARGS_ASSERT_FIND_SCRIPT \ assert(scriptname) -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) STATIC OP* S_force_list(pTHX_ OP* arg); STATIC OP* S_fold_constants(pTHX_ OP *o) __attribute__nonnull__(pTHX_1); @@ -814,7 +814,7 @@ PERL_CALLCONV char* Perl_vform(pTHX_ const char* pat, va_list* args) assert(pat) PERL_CALLCONV void Perl_free_tmps(pTHX); -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) STATIC OP* S_gen_constant_list(pTHX_ OP* o); #endif #if !defined(HAS_GETENV_LEN) @@ -1110,7 +1110,7 @@ PERL_CALLCONV I32 Perl_ibcmp_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool #define PERL_ARGS_ASSERT_IBCMP_UTF8 \ assert(s1); assert(s2) -#if defined(PERL_IN_DOIO_C) +#if defined(PERL_IN_DOIO_C) || defined(PERL_DECL_PROT) STATIC bool S_ingroup(pTHX_ Gid_t testgid, bool effective) __attribute__warn_unused_result__; @@ -1437,7 +1437,7 @@ PERL_CALLCONV void Perl_op_clear(pTHX_ OP* o) PERL_CALLCONV void Perl_op_refcnt_lock(pTHX); PERL_CALLCONV void Perl_op_refcnt_unlock(pTHX); -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) STATIC OP* S_linklist(pTHX_ OP *o) __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_LINKLIST \ @@ -2365,7 +2365,7 @@ PERL_CALLCONV OP* Perl_oopsHV(pTHX_ OP* o) PERL_CALLCONV void Perl_pad_leavemy(pTHX); PERL_CALLCONV SV* Perl_pad_sv(pTHX_ PADOFFSET po); PERL_CALLCONV void Perl_pad_free(pTHX_ PADOFFSET po); -#if defined(PERL_IN_PAD_C) +#if defined(PERL_IN_PAD_C) || defined(PERL_DECL_PROT) STATIC void S_pad_reset(pTHX); #endif PERL_CALLCONV void Perl_pad_swipe(pTHX_ PADOFFSET po, bool refadjust); @@ -2499,7 +2499,7 @@ PERL_CALLCONV OP* Perl_pmruntime(pTHX_ OP *o, OP *expr, bool isreg) #define PERL_ARGS_ASSERT_PMRUNTIME \ assert(o); assert(expr) -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) STATIC OP* S_pmtrans(pTHX_ OP* o, OP* expr, OP* repl) __attribute__nonnull__(pTHX_1) __attribute__nonnull__(pTHX_2) @@ -2512,7 +2512,7 @@ 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* Perl_ref(pTHX_ OP* o, I32 type); */ -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) STATIC OP* S_refkids(pTHX_ OP* o, I32 type); #endif PERL_CALLCONV void Perl_regdump(pTHX_ const regexp* r) @@ -2693,7 +2693,7 @@ PERL_CALLCONV int Perl_rsignal_save(pTHX_ int i, Sighandler_t t1, Sigsave_t* sav assert(save) PERL_CALLCONV Sighandler_t Perl_rsignal_state(pTHX_ int i); -#if defined(PERL_IN_PP_CTL_C) +#if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT) STATIC void S_rxres_free(pTHX_ void** rsp) __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_RXRES_FREE \ @@ -2921,7 +2921,7 @@ STATIC void S_save_pushptri32ptr(pTHX_ void *const ptr1, const I32 i, void *cons #endif PERL_CALLCONV OP* Perl_sawparens(pTHX_ OP* o); PERL_CALLCONV OP* Perl_scalar(pTHX_ OP* o); -#if defined(PERL_IN_OP_C) +#if defined(PERL_IN_OP_C) || defined(PERL_DECL_PROT) STATIC OP* S_scalarkids(pTHX_ OP* o); STATIC OP* S_scalarseq(pTHX_ OP* o); #endif @@ -3003,7 +3003,7 @@ PERL_CALLCONV IO* Perl_sv_2io(pTHX_ SV *const sv) #define PERL_ARGS_ASSERT_SV_2IO \ assert(sv) -#ifdef PERL_IN_SV_C +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) STATIC bool S_glob_2number(pTHX_ GV* const gv) __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_GLOB_2NUMBER \ @@ -3077,7 +3077,7 @@ PERL_CALLCONV char* Perl_sv_pvbyten(pTHX_ SV *sv, STRLEN *lp) assert(sv); assert(lp) PERL_CALLCONV I32 Perl_sv_true(pTHX_ SV *const sv); -#if defined (PERL_IN_SV_C) +#if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT) STATIC void S_sv_add_arena(pTHX_ char *const ptr, const U32 size, const U32 flags) __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_SV_ADD_ARENA \ @@ -6026,7 +6026,7 @@ PERL_CALLCONV PerlIO * Perl_PerlIO_stderr(pTHX) #endif /* PERLIO_LAYERS */ PERL_CALLCONV void Perl_deb_stack_all(pTHX); -#ifdef PERL_IN_DEB_C +#if defined(PERL_IN_DEB_C) || defined(PERL_DECL_PROT) STATIC void S_deb_stack_n(pTHX_ SV** stack_base, I32 stack_min, I32 stack_max, I32 mark_min, I32 mark_max) __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_DEB_STACK_N \ -- 2.7.4