remove unused define and old inlining controls

diff --git a/src/nfa/mcclellan.c b/src/nfa/mcclellan.c
index 992f78e292961542c268d5b0627acfb7c2783a0f..b8ca75e9e75df860d719e2cd0fa28822721bb2f6 100644 (file)
--- 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 e3bcf43ed8657d756f6e973558808d750982731e..4906ce5b4f3b1492f5114b461fa3882835b7b56f 100644 (file)
--- 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,