diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-02-10 23:48:33 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-10 23:48:33 +0100 |
commit | 0199c68d010b613bde2575cd54d8c3597431fc81 (patch) | |
tree | bface5b67ae70075c2e303bd947b54dbbb5f2aad /grep.h | |
parent | Merge branch 'jk/pretty-lazy-load-commit' (diff) | |
parent | Remove support for v1 of the PCRE library (diff) | |
download | git-0199c68d010b613bde2575cd54d8c3597431fc81.tar.xz git-0199c68d010b613bde2575cd54d8c3597431fc81.zip |
Merge branch 'ab/retire-pcre1'
The support for deprecated PCRE1 library has been dropped.
* ab/retire-pcre1:
Remove support for v1 of the PCRE library
config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag
Diffstat (limited to 'grep.h')
-rw-r--r-- | grep.h | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -1,15 +1,6 @@ #ifndef GREP_H #define GREP_H #include "color.h" -#ifdef USE_LIBPCRE1 -#include <pcre.h> -#ifndef PCRE_NO_UTF8_CHECK -#define PCRE_NO_UTF8_CHECK 0 -#endif -#else -typedef int pcre; -typedef int pcre_extra; -#endif #ifdef USE_LIBPCRE2 #define PCRE2_CODE_UNIT_WIDTH 8 #include <pcre2.h> @@ -71,10 +62,6 @@ struct grep_pat { size_t patternlen; enum grep_header_field field; regex_t regexp; - pcre *pcre1_regexp; - pcre_extra *pcre1_extra_info; - const unsigned char *pcre1_tables; - int pcre1_jit_on; pcre2_code *pcre2_pattern; pcre2_match_data *pcre2_match_data; pcre2_compile_context *pcre2_compile_context; @@ -143,7 +130,6 @@ struct grep_opt { int allow_textconv; int extended; int use_reflog_filter; - int pcre1; int pcre2; int relative; int pathname; |