summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-15 12:14:34 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-15 12:14:34 +0900
commit2620b47794e3238ee5c7dd6b8a38f58732ace3a2 (patch)
tree5dad7d6e3d92d164f82f8bbe886ef000fa4f6d9d /grep.c
parentf13b8ec25e3171301c50146f559170a6756efb53 (diff)
parent2fff1e196d9cf03a868e99da39ea21b7c18c65c5 (diff)
downloadgit-2620b47794e3238ee5c7dd6b8a38f58732ace3a2.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/grep.c b/grep.c
index ce6a48e634..d0b9b6cdfa 100644
--- a/grep.c
+++ b/grep.c
@@ -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);