diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 06:14:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 06:14:34 +0300 |
| commit | 2620b47794e3238ee5c7dd6b8a38f58732ace3a2 (patch) | |
| tree | 5dad7d6e3d92d164f82f8bbe886ef000fa4f6d9d /grep.h | |
| parent | f13b8ec25e3171301c50146f559170a6756efb53 (diff) | |
| parent | 2fff1e196d9cf03a868e99da39ea21b7c18c65c5 (diff) | |
Merge branch 'ab/pcre-v2'
Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed.
* ab/pcre-v2:
grep: fix NO_LIBPCRE1_JIT to fully disable JIT
Diffstat (limited to 'grep.h')
| -rw-r--r-- | grep.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -7,11 +7,12 @@ #if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32 #ifndef NO_LIBPCRE1_JIT #define GIT_PCRE1_USE_JIT +#define GIT_PCRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE #endif #endif #endif -#ifndef PCRE_STUDY_JIT_COMPILE -#define PCRE_STUDY_JIT_COMPILE 0 +#ifndef GIT_PCRE_STUDY_JIT_COMPILE +#define GIT_PCRE_STUDY_JIT_COMPILE 0 #endif #if PCRE_MAJOR <= 8 && PCRE_MINOR < 20 typedef int pcre_jit_stack; |