summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorCarlo Marcelo Arenas Belón <carenas@gmail.com>2019-08-25 18:22:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-26 18:37:02 (GMT)
commitff61681b46760f6a64353018760bccc14c90f8e9 (patch)
treecd0c70dec90b31375b91176f77f3e8dd32969aeb /grep.h
parent8991da6a3864d93d860afe4c510b4fdbf0da6363 (diff)
downloadgit-ff61681b46760f6a64353018760bccc14c90f8e9.zip
git-ff61681b46760f6a64353018760bccc14c90f8e9.tar.gz
git-ff61681b46760f6a64353018760bccc14c90f8e9.tar.bz2
grep: refactor and simplify PCRE1 support
The code used both a macro and a variable to keep track if JIT support was desired and relied on the fact that a non JIT enabled library will ignore a request for JIT compilation (as defined by the second parameter of the call to pcre_study) Cleanup the multiple levels of macros used and call pcre_study with the right parameter after JIT support has been confirmed and unless it was requested to be disabled with NO_LIBPCRE1_JIT Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/grep.h b/grep.h
index 1a044c5..ff620d7 100644
--- a/grep.h
+++ b/grep.h
@@ -3,15 +3,6 @@
#include "color.h"
#ifdef USE_LIBPCRE1
#include <pcre.h>
-#ifndef NO_LIBPCRE1_JIT
-#ifdef PCRE_CONFIG_JIT
-#define GIT_PCRE1_USE_JIT
-#define GIT_PCRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE
-#endif
-#endif
-#ifndef GIT_PCRE_STUDY_JIT_COMPILE
-#define GIT_PCRE_STUDY_JIT_COMPILE 0
-#endif
#else
typedef int pcre;
typedef int pcre_extra;