From 2e08dfb2b133af0fbcb4346f8d096ca68454ca54 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Fri, 8 Apr 2016 12:21:24 -0600 Subject: [PATCH] Revert "Make instr() a macro" This reverts commit fea1d2dd5d210564d442a09fe034b62f262f35f9 due to it causing problems so close to the release of 5.24. See https://rt.perl.org/Ticket/Display.html?id=127852 --- embed.fnc | 2 +- embed.h | 1 + proto.h | 4 ++-- util.h | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/embed.fnc b/embed.fnc index 7f60ae1..a64ffba 100644 --- a/embed.fnc +++ b/embed.fnc @@ -647,7 +647,7 @@ p |void |init_debugger Ap |void |init_stacks Ap |void |init_tm |NN struct tm *ptm : Used in perly.y -AbmnpPR |char* |instr |NN const char* big|NN const char* little +AnpPR |char* |instr |NN const char* big|NN const char* little : Used in sv.c p |bool |io_close |NN IO* io|NULLOK GV *gv \ |bool not_implicit|bool warn_on_fail diff --git a/embed.h b/embed.h index c24eb31..42c65b2 100644 --- a/embed.h +++ b/embed.h @@ -238,6 +238,7 @@ #define init_i18nl14n(a) Perl_init_i18nl14n(aTHX_ a) #define init_stacks() Perl_init_stacks(aTHX) #define init_tm(a) Perl_init_tm(aTHX_ a) +#define instr Perl_instr #define intro_my() Perl_intro_my(aTHX) #define isALNUM_lazy(a) Perl_isALNUM_lazy(aTHX_ a) #define isIDFIRST_lazy(a) Perl_isIDFIRST_lazy(aTHX_ a) diff --git a/proto.h b/proto.h index 4beb21b..fb4ee29 100644 --- a/proto.h +++ b/proto.h @@ -1244,9 +1244,9 @@ PERL_CALLCONV void Perl_init_stacks(pTHX); PERL_CALLCONV void Perl_init_tm(pTHX_ struct tm *ptm); #define PERL_ARGS_ASSERT_INIT_TM \ assert(ptm) -/* PERL_CALLCONV char* Perl_instr(const char* big, const char* little) +PERL_CALLCONV char* Perl_instr(const char* big, const char* little) __attribute__warn_unused_result__ - __attribute__pure__; */ + __attribute__pure__; #define PERL_ARGS_ASSERT_INSTR \ assert(big); assert(little) diff --git a/util.h b/util.h index 3a74bd0..3310b11 100644 --- a/util.h +++ b/util.h @@ -229,8 +229,6 @@ means arg not present, 1 is empty string/null byte */ # define HS_CXT cv #endif -#define instr(haystack, needle) strstr(haystack, needle) - /* * ex: set ts=8 sts=4 sw=4 et: */ -- 1.8.3.1