Merge branch 'hw/remove-api-docs-placeholder'

[thirdparty/git.git] / grep.h

diff --git a/grep.h b/grep.h
index 1060f0fe500eaedd842bdf6b3dd04d8220a49a12..811fd274c95b0528223fff8d684c5299c10a9967 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -6,17 +6,6 @@
 #ifndef PCRE_NO_UTF8_CHECK
 #define PCRE_NO_UTF8_CHECK 0
 #endif
-#ifdef PCRE_CONFIG_JIT
-#if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32
-#ifndef NO_LIBPCRE1_JIT
-#define GIT_PCRE1_USE_JIT
-#define GIT_PCRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE
-#endif
-#endif
-#endif
-#ifndef GIT_PCRE_STUDY_JIT_COMPILE
-#define GIT_PCRE_STUDY_JIT_COMPILE 0
-#endif
 #else
 typedef int pcre;
 typedef int pcre_extra;
@@ -89,6 +78,7 @@ struct grep_pat {
        pcre2_code *pcre2_pattern;
        pcre2_match_data *pcre2_match_data;
        pcre2_compile_context *pcre2_compile_context;
+       const uint8_t *pcre2_tables;
        uint32_t pcre2_jit_on;
        unsigned fixed:1;
        unsigned is_fixed:1;
@@ -183,6 +173,7 @@ struct grep_opt {
 void init_grep_defaults(struct repository *);
 int grep_config(const char *var, const char *value, void *);
 void grep_init(struct grep_opt *, struct repository *repo, const char *prefix);
+void grep_destroy(void);
 void grep_commit_pattern_type(enum grep_pattern_type, struct grep_opt *opt);
 
 void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t);