diff options
| author | Carlo Marcelo Arenas Belón <carenas@gmail.com> | 2019-08-25 11:22:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-26 11:37:01 -0700 |
| commit | 8991da6a3864d93d860afe4c510b4fdbf0da6363 (patch) | |
| tree | dd619d2821eca27b0a0f9082a9df9b49f248467f /grep.h | |
| parent | c581e4a7499b9e1089847dbbc057afbef1ed861e (diff) | |
| download | git-8991da6a3864d93d860afe4c510b4fdbf0da6363.tar.gz | |
grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
e87de7cab4 ("grep: un-break building with PCRE < 8.32", 2017-05-25)
added a restriction for JIT support that is no longer needed after
pcre_jit_exec() calls were removed.
Reorganize the definitions in grep.h so that JIT support could be
detected early and NO_LIBPCRE1_JIT could be used reliably to enforce
JIT doesn't get used.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.h')
| -rw-r--r-- | grep.h | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -3,14 +3,12 @@ #include "color.h" #ifdef USE_LIBPCRE1 #include <pcre.h> -#ifdef PCRE_CONFIG_JIT -#if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32 #ifndef NO_LIBPCRE1_JIT +#ifdef PCRE_CONFIG_JIT #define GIT_PCRE1_USE_JIT #define GIT_PCRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE #endif #endif -#endif #ifndef GIT_PCRE_STUDY_JIT_COMPILE #define GIT_PCRE_STUDY_JIT_COMPILE 0 #endif |