summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-15 03:14:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-15 03:14:34 (GMT)
commit2620b47794e3238ee5c7dd6b8a38f58732ace3a2 (patch)
tree5dad7d6e3d92d164f82f8bbe886ef000fa4f6d9d /grep.h
parentf13b8ec25e3171301c50146f559170a6756efb53 (diff)
parent2fff1e196d9cf03a868e99da39ea21b7c18c65c5 (diff)
downloadgit-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.h')
-rw-r--r--grep.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/grep.h b/grep.h
index 52aecfa..399381c 100644
--- a/grep.h
+++ b/grep.h
@@ -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;