aboutsummaryrefslogtreecommitdiffstats
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-03-30 13:47:12 -0700
committerJunio C Hamano <gitster@pobox.com>2023-03-30 13:47:12 -0700
commitd35cd54a23f8114dd6924f705cd125c71b8c1746 (patch)
tree2b415e8b6827e0de69c830bf8b7a98d1ca0cac8d /grep.h
parenta15b8451f2451fd212e0929b1bacb34de28cdc46 (diff)
parent14b9a044798ebb3858a1f1a1377309a3d6054ac8 (diff)
downloadgit-d35cd54a23f8114dd6924f705cd125c71b8c1746.tar.gz
Merge branch 'mk/workaround-pcre-jit-ucp-bug'
A recent-ish change to allow unicode character classes to be used with "grep -P" triggered a JIT bug in older pcre2 libraries. The problematic change in Git built with these older libraries has been disabled to work around the bug. * mk/workaround-pcre-jit-ucp-bug: grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/grep.h b/grep.h
index 6075f997e6..c59592e3bd 100644
--- a/grep.h
+++ b/grep.h
@@ -7,6 +7,9 @@
#if (PCRE2_MAJOR >= 10 && PCRE2_MINOR >= 36) || PCRE2_MAJOR >= 11
#define GIT_PCRE2_VERSION_10_36_OR_HIGHER
#endif
+#if (PCRE2_MAJOR >= 10 && PCRE2_MINOR >= 35) || PCRE2_MAJOR >= 11
+#define GIT_PCRE2_VERSION_10_35_OR_HIGHER
+#endif
#if (PCRE2_MAJOR >= 10 && PCRE2_MINOR >= 34) || PCRE2_MAJOR >= 11
#define GIT_PCRE2_VERSION_10_34_OR_HIGHER
#endif