diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 03:14:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 03:14:34 (GMT) |
| commit | 2620b47794e3238ee5c7dd6b8a38f58732ace3a2 (patch) | |
| tree | 5dad7d6e3d92d164f82f8bbe886ef000fa4f6d9d /grep.c | |
| parent | f13b8ec25e3171301c50146f559170a6756efb53 (diff) | |
| parent | 2fff1e196d9cf03a868e99da39ea21b7c18c65c5 (diff) | |
| download | git-2620b47794e3238ee5c7dd6b8a38f58732ace3a2.zip git-2620b47794e3238ee5c7dd6b8a38f58732ace3a2.tar.gz git-2620b47794e3238ee5c7dd6b8a38f58732ace3a2.tar.bz2 | |
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.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); |