summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-30 22:17:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-30 22:17:09 (GMT)
commit808dab2b58bdf8fb28ad932f32659ede97bb2387 (patch)
tree7f691c6c5aa06e34af321dfe368f8fab02f6675a /compat
parentfec1ff97c2b3c9c5db7e8f2df8d2c81cb94972fd (diff)
parentf65d07fffaadc556b1a18cda7bb611c7f68717ea (diff)
downloadgit-808dab2b58bdf8fb28ad932f32659ede97bb2387.zip
git-808dab2b58bdf8fb28ad932f32659ede97bb2387.tar.gz
git-808dab2b58bdf8fb28ad932f32659ede97bb2387.tar.bz2
Merge branch 'jk/asan-build-fix'
Work around test breakages caused by custom regex engine used in libasan, when address sanitizer is used with more recent versions of gcc and clang. * jk/asan-build-fix: Makefile: use compat regex with SANITIZE=address
Diffstat (limited to 'compat')
-rw-r--r--compat/regex/regex.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/compat/regex/regex.h b/compat/regex/regex.h
index 08a2609..2d34128 100644
--- a/compat/regex/regex.h
+++ b/compat/regex/regex.h
@@ -41,6 +41,11 @@
extern "C" {
#endif
+#define regcomp git_regcomp
+#define regexec git_regexec
+#define regerror git_regerror
+#define regfree git_regfree
+
/* The following two types have to be signed and unsigned integer type
wide enough to hold a value of a pointer. For most ANSI compilers
ptrdiff_t and size_t should be likely OK. Still size of these two