mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep: refactor and simplify PCRE1 support

Browse Source 
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>
This commit is contained in:
Carlo Marcelo Arenas Belón
2019-08-25 11:22:23 -07:00
committed by Junio C Hamano
parent 8991da6a38
commit ff61681b46
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
grep.h
View File

@ -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;