From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Oct 2019 05:24:47 +0000 (+0900)
Subject: Merge branch 'cb/pcre1-cleanup'
X-Git-Tag: v2.24.0-rc0~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93424f1f7d790944168d46faf5222a388898d031;p=git

Merge branch 'cb/pcre1-cleanup'

PCRE fixes.

* cb/pcre1-cleanup:
  grep: refactor and simplify PCRE1 support
  grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
---

93424f1f7d790944168d46faf5222a388898d031
diff --cc grep.h
index 1060f0fe50,ff620d784a..05dc1bb98e
--- a/grep.h
+++ b/grep.h
@@@ -3,20 -3,6 +3,9 @@@
  #include "color.h"
  #ifdef USE_LIBPCRE1
  #include <pcre.h>
 +#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;