From 05683655cb4b08e2fd6703591968cc22eece47ef Mon Sep 17 00:00:00 2001 From: Alex Coyte Date: Thu, 27 Oct 2016 14:29:34 +1100 Subject: [PATCH] remove unused define and old inlining controls --- src/nfa/mcclellan.c | 4 ++-- src/nfa/mcclellan_common_impl.h | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/nfa/mcclellan.c b/src/nfa/mcclellan.c index 992f78e2..b8ca75e9 100644 --- a/src/nfa/mcclellan.c +++ b/src/nfa/mcclellan.c @@ -583,7 +583,7 @@ char nfaExecMcClellan16_Q2i(const struct NFA *n, u64a offset, const u8 *buffer, } } -static really_inline really_flatten +static really_inline char nfaExecMcClellan16_Bi(const struct NFA *n, u64a offset, const u8 *buffer, size_t length, NfaCallback cb, void *context, char single) { @@ -732,7 +732,7 @@ char nfaExecMcClellan8_Q2i(const struct NFA *n, u64a offset, const u8 *buffer, } } -static really_inline really_flatten +static really_inline char nfaExecMcClellan8_Bi(const struct NFA *n, u64a offset, const u8 *buffer, size_t length, NfaCallback cb, void *context, char single) { diff --git a/src/nfa/mcclellan_common_impl.h b/src/nfa/mcclellan_common_impl.h index e3bcf43e..4906ce5b 100644 --- a/src/nfa/mcclellan_common_impl.h +++ b/src/nfa/mcclellan_common_impl.h @@ -26,14 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#if defined(__INTEL_COMPILER) || defined(__clang__) || defined(_WIN32) || defined(__GNUC__) && (__GNUC__ < 4) -#define really_flatten -#else -#define really_flatten __attribute__ ((flatten)) -#endif - -#define CASE_MASK 0xdf - enum MatchMode { CALLBACK_OUTPUT, STOP_AT_MATCH,