diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:47 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:47 +0900 |
commit | 93424f1f7d790944168d46faf5222a388898d031 (patch) | |
tree | 08bc467ba4b98aa5dd4beee2f0391714e2c8b779 /grep.h | |
parent | a73f91774cbfb6f31bca328ebf200498fe92d97a (diff) | |
parent | ff61681b46760f6a64353018760bccc14c90f8e9 (diff) | |
download | git-93424f1f7d790944168d46faf5222a388898d031.tar.gz |
Merge branch 'cb/pcre1-cleanup'
PCRE fixes.
* cb/pcre1-cleanup:
grep: refactor and simplify PCRE1 support
grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
Diffstat (limited to 'grep.h')
-rw-r--r-- | grep.h | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -6,17 +6,6 @@ #ifndef PCRE_NO_UTF8_CHECK #define PCRE_NO_UTF8_CHECK 0 #endif -#ifdef PCRE_CONFIG_JIT -#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 GIT_PCRE_STUDY_JIT_COMPILE -#define GIT_PCRE_STUDY_JIT_COMPILE 0 -#endif #else typedef int pcre; typedef int pcre_extra; |