refactoring (USE_THREADED_CODE)

diff --git a/src/regexec.c b/src/regexec.c
index 03843f0d32c2d81e9f89153b6af18b32a9d180fe..21181f2152e1611411273b9679039f06e2f7baf4 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -2366,7 +2366,7 @@ typedef struct {
 
 
 
-#ifdef USE_GOTO_LABELS_AS_VALUES
+#ifdef USE_THREADED_CODE
 
 #define BYTECODE_INTERPRETER_START      GOTO_OP;
 #define BYTECODE_INTERPRETER_END
@@ -2396,7 +2396,7 @@ typedef struct {
 #define GOTO_OP      continue; break
 #define BREAK_OP     break
 
-#endif /* USE_GOTO_LABELS_AS_VALUES */
+#endif /* USE_THREADED_CODE */
 
 #define INC_OP       p++
 #define NEXT_OUT     SOP_OUT; NEXT_OP
@@ -2457,7 +2457,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
   static Operation FinishCode[] = { { OP_FINISH } };
 #endif
 
-#ifdef USE_GOTO_LABELS_AS_VALUES
+#ifdef USE_THREADED_CODE
   static const void *opcode_to_label[] = {
   &&L_FINISH,
   &&L_END,

diff --git a/src/regint.h b/src/regint.h
index 9c3c6d8a12f0d5a930bf42ab4fd17d0a8182f5d8..b6892e3d1e3257ecefb195ef543db5dc3aa2f73e 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -68,6 +68,7 @@
 #define USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR
 #define USE_RETRY_LIMIT_IN_MATCH
 #ifdef USE_GOTO_LABELS_AS_VALUES
+#define USE_THREADED_CODE
 #define USE_DIRECT_THREADED_CODE
 #endif