| commit | 2fff1e196d9cf03a868e99da39ea21b7c18c65c5 | |
| author | Charles Bailey <cbailey32@bloomberg.net> | |
| Sun, 12 Nov 2017 16:59:38 +0000 (12 16:59 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Nov 2017 03:49:53 +0000 (13 12:49 +0900) | ||
| tree | a8d0d8ec11dfcdc8f8c125f845cab21b93893531 | treesnapshot (tar.gz zip) |
| parent | 674ad936bb40332e016b60c59d1982c832338493 | commitdiff |
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>
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>
| grep.c | diffblobblamehistory | |
| grep.h | diffblobblamehistory |