From 70a6e658a75720da8d999a28489475f2c4c51bd1 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Fri, 19 Feb 2010 10:11:43 +0100 Subject: [PATCH] Regen headers after previous patches --- embed.h | 8 ++++++-- proto.h | 13 +++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/embed.h b/embed.h index eda36a7..afbf1da 100644 --- a/embed.h +++ b/embed.h @@ -43,6 +43,9 @@ #endif #define get_context Perl_get_context #define set_context Perl_set_context +#if defined(PERL_CORE) || defined(PERL_EXT) +#define regcurly Perl_regcurly +#endif #define amagic_call Perl_amagic_call #define Gv_AMupdate Perl_Gv_AMupdate #define gv_handler Perl_gv_handler @@ -1447,7 +1450,6 @@ #define regbranch S_regbranch #define reguni S_reguni #define regclass S_regclass -#define regcurly S_regcurly #define reg_node S_reg_node #define reg_recode S_reg_recode #define regpiece S_regpiece @@ -2454,6 +2456,9 @@ #endif #define get_context Perl_get_context #define set_context Perl_set_context +#if defined(PERL_CORE) || defined(PERL_EXT) +#define regcurly Perl_regcurly +#endif #define amagic_call(a,b,c,d) Perl_amagic_call(aTHX_ a,b,c,d) #define Gv_AMupdate(a,b) Perl_Gv_AMupdate(aTHX_ a,b) #define gv_handler(a,b) Perl_gv_handler(aTHX_ a,b) @@ -3856,7 +3861,6 @@ #define regbranch(a,b,c,d) S_regbranch(aTHX_ a,b,c,d) #define reguni(a,b,c) S_reguni(aTHX_ a,b,c) #define regclass(a,b) S_regclass(aTHX_ a,b) -#define regcurly S_regcurly #define reg_node(a,b) S_reg_node(aTHX_ a,b) #define reg_recode(a,b) S_reg_recode(aTHX_ a,b) #define regpiece(a,b,c) S_regpiece(aTHX_ a,b,c) diff --git a/proto.h b/proto.h index 01be297..979076f 100644 --- a/proto.h +++ b/proto.h @@ -119,6 +119,13 @@ PERL_CALLCONV void Perl_set_context(void *t) #define PERL_ARGS_ASSERT_SET_CONTEXT \ assert(t) +PERL_CALLCONV I32 Perl_regcurly(const char *s) + __attribute__warn_unused_result__ + __attribute__pure__ + __attribute__nonnull__(1); +#define PERL_ARGS_ASSERT_REGCURLY \ + assert(s) + END_EXTERN_C @@ -5314,12 +5321,6 @@ STATIC regnode* S_regclass(pTHX_ struct RExC_state_t *pRExC_state, U32 depth) #define PERL_ARGS_ASSERT_REGCLASS \ assert(pRExC_state) -STATIC I32 S_regcurly(const char *s) - __attribute__warn_unused_result__ - __attribute__nonnull__(1); -#define PERL_ARGS_ASSERT_REGCURLY \ - assert(s) - STATIC regnode* S_reg_node(pTHX_ struct RExC_state_t *pRExC_state, U8 op) __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_REG_NODE \ -- 2.7.4