summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2017-05-25 19:45:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-26 03:52:37 (GMT)
commit6d4b5747f06754efd467d3dde32367f27615fa7b (patch)
tree9ec40c46e01a558ec53a5052faa1acaa0523537c /grep.h
parent3485bea1578986eab80ff1d4fa480d8d1aa224fe (diff)
downloadgit-6d4b5747f06754efd467d3dde32367f27615fa7b.zip
git-6d4b5747f06754efd467d3dde32367f27615fa7b.tar.gz
git-6d4b5747f06754efd467d3dde32367f27615fa7b.tar.bz2
grep: change internal *pcre* variable & function names to be *pcre1*
Change the internal PCRE variable & function names to have a "1" suffix. This is for preparation for libpcre2 support, where having non-versioned names would be confusing. An earlier change in this series ("grep: change the internal PCRE macro names to be PCRE1", 2017-04-07) elaborates on the motivations behind this change. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/grep.h b/grep.h
index 073b0e4..38ac82b 100644
--- a/grep.h
+++ b/grep.h
@@ -46,9 +46,9 @@ struct grep_pat {
size_t patternlen;
enum grep_header_field field;
regex_t regexp;
- pcre *pcre_regexp;
- pcre_extra *pcre_extra_info;
- const unsigned char *pcre_tables;
+ pcre *pcre1_regexp;
+ pcre_extra *pcre1_extra_info;
+ const unsigned char *pcre1_tables;
kwset_t kws;
unsigned fixed:1;
unsigned ignore_case:1;
@@ -111,7 +111,7 @@ struct grep_opt {
int allow_textconv;
int extended;
int use_reflog_filter;
- int pcre;
+ int pcre1;
int relative;
int pathname;
int null_following_name;