diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:05:30 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:05:30 +0900 |
| commit | 8e3e51a3a791074110ab1946d8da3430c65d435c (patch) | |
| tree | be2ded3ce4fa8c2f2bf689e9beb5e550578c4e6e /grep.c | |
| parent | b77b96e29b9429a6cf10dd6fad15f9a220977029 (diff) | |
| parent | 2fff1e196d9cf03a868e99da39ea21b7c18c65c5 (diff) | |
| download | git-8e3e51a3a791074110ab1946d8da3430c65d435c.tar.gz | |
Merge branch 'ab/pcre-v2' into maint
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.c')
| -rw-r--r-- | grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -387,7 +387,7 @@ static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt) if (!p->pcre1_regexp) compile_regexp_failed(p, error); - p->pcre1_extra_info = pcre_study(p->pcre1_regexp, PCRE_STUDY_JIT_COMPILE, &error); + p->pcre1_extra_info = pcre_study(p->pcre1_regexp, GIT_PCRE_STUDY_JIT_COMPILE, &error); if (!p->pcre1_extra_info && error) die("%s", error); |