summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorLibravatar Charles Bailey <cbailey32@bloomberg.net>2017-11-12 16:59:38 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-13 12:49:53 +0900
commit2fff1e196d9cf03a868e99da39ea21b7c18c65c5 (patch)
treea8d0d8ec11dfcdc8f8c125f845cab21b93893531 /builtin/am.c
parentgrep: fix erroneously copy/pasted variable in check/assert pattern (diff)
downloadtgif-2fff1e196d9cf03a868e99da39ea21b7c18c65c5.tar.xz
grep: fix NO_LIBPCRE1_JIT to fully disable JIT
If you have a pcre1 library which is compiled with JIT enabled then PCRE_STUDY_JIT_COMPILE will be defined whether or not the NO_LIBPCRE1_JIT configuration is set. This means that we enable JIT functionality when calling pcre_study even if NO_LIBPCRE1_JIT has been explicitly set and we just use plain pcre_exec later. Fix this by using own macro (GIT_PCRE_STUDY_JIT_COMPILE) which we set to PCRE_STUDY_JIT_COMPILE only if NO_LIBPCRE1_JIT is not set and define to 0 otherwise, as before. Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/am.c')
0 files changed, 0 insertions, 0 deletions