diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-02-10 14:48:33 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-10 14:48:33 -0800 |
commit | 59ace284f33fe9928fcdb04b02044c921fd6905e (patch) | |
tree | 53840b244e5edc39b90e347ff8c48e6254a0e4b6 /grep.h | |
parent | 0199c68d010b613bde2575cd54d8c3597431fc81 (diff) | |
parent | 95ca1f987edd23389e3079d0a7fe6d0f89927b68 (diff) |
Merge branch 'ab/grep-pcre-invalid-utf8'
Update support for invalid UTF-8 in PCRE2. * ab/grep-pcre-invalid-utf8: grep/pcre2: better support invalid UTF-8 haystacks grep/pcre2 tests: don't rely on invalid UTF-8 data test
Diffstat (limited to 'grep.h')
-rw-r--r-- | grep.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/grep.h b/grep.h index 50102c3537..ae89d6254b 100644 --- a/grep.h +++ b/grep.h @@ -9,6 +9,10 @@ typedef int pcre2_code; typedef int pcre2_match_data; typedef int pcre2_compile_context; #endif +#ifndef PCRE2_MATCH_INVALID_UTF +/* PCRE2_MATCH_* dummy also with !USE_LIBPCRE2, for test-pcre2-config.c */ +#define PCRE2_MATCH_INVALID_UTF 0 +#endif #include "thread-utils.h" #include "userdiff.h" |