git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Jeffrey Walton" <noloader@gmail.com>,
	"Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>,
	"J Smith" <dark.panda@gmail.com>,
	"Victor Leschuk" <vleschuk@gmail.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"Fredrik Kuivinen" <frekui@gmail.com>,
	"Brandon Williams" <bmwill@google.com>,
	"Stefan Beller" <sbeller@google.com>,
	"Johannes Schindelin" <johannes.schindelin@gmx.de>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v4 6/8] grep: un-break building with PCRE < 8.20
Date: Thu,  1 Jun 2017 18:20:54 +0000	[thread overview]
Message-ID: <20170601182056.31142-7-avarab@gmail.com> (raw)
In-Reply-To: <20170601182056.31142-1-avarab@gmail.com>

Amend my change earlier in this series ("grep: add support for the
PCRE v1 JIT API", 2017-04-11) to un-break the build on PCRE v1
versions earlier than 8.20.

The 8.20 release was the first release to have JIT & pcre_jit_stack in
the headers, so a mock type needs to be provided for it on those
releases.

Now git should compile with all PCRE versions that it supported before
my JIT change.

I've tested it as far back as version 7.5 released on 2008-01-10, once
I got down to version 7.0 it wouldn't build anymore with GCC 7.1.1,
and I couldn't be bothered to anything older than 7.5 as I'm confident
that if the build breaks on those older versions it's not because of
my JIT change.

See the "un-break" change in this series ("grep: un-break building
with PCRE < 8.32", 2017-05-10) for why this isn't squashed into the
main PCRE JIT commit.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 grep.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/grep.h b/grep.h
index 3b948d9155..ce90969736 100644
--- a/grep.h
+++ b/grep.h
@@ -11,6 +11,9 @@
 #ifndef PCRE_STUDY_JIT_COMPILE
 #define PCRE_STUDY_JIT_COMPILE 0
 #endif
+#if PCRE_MAJOR <= 8 && PCRE_MINOR < 20
+typedef int pcre_jit_stack;
+#endif
 #else
 typedef int pcre;
 typedef int pcre_extra;
-- 
2.13.0.303.g4ebf302169


  parent reply	other threads:[~2017-06-01 18:21 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-01 18:20 [PATCH v4 0/8] PCRE v2, PCRE v1 JIT, log -P & fixes Ævar Arnfjörð Bjarmason
2017-06-01 18:20 ` [PATCH v4 1/8] grep: don't redundantly compile throwaway patterns under threading Ævar Arnfjörð Bjarmason
2017-06-01 18:20 ` [PATCH v4 2/8] grep: skip pthreads overhead when using one thread Ævar Arnfjörð Bjarmason
2017-06-01 21:20   ` Stefan Beller
2017-06-01 21:36     ` Ævar Arnfjörð Bjarmason
2017-06-01 21:38       ` Ævar Arnfjörð Bjarmason
2017-06-01 21:45         ` Stefan Beller
2017-06-01 21:55           ` Ævar Arnfjörð Bjarmason
2017-06-01 22:08             ` Stefan Beller
2017-06-01 18:20 ` [PATCH v4 3/8] log: add -P as a synonym for --perl-regexp Ævar Arnfjörð Bjarmason
2017-06-01 18:20 ` [PATCH v4 4/8] grep: add support for the PCRE v1 JIT API Ævar Arnfjörð Bjarmason
2017-06-01 18:20 ` [PATCH v4 5/8] grep: un-break building with PCRE < 8.32 Ævar Arnfjörð Bjarmason
2017-06-01 18:20 ` Ævar Arnfjörð Bjarmason [this message]
2017-06-01 18:20 ` [PATCH v4 7/8] grep: un-break building with PCRE >= 8.32 without --enable-jit Ævar Arnfjörð Bjarmason
2017-06-01 18:20 ` [PATCH v4 8/8] grep: add support for PCRE v2 Ævar Arnfjörð Bjarmason
2017-06-01 23:30 ` [PATCH v4 0/8] PCRE v2, PCRE v1 JIT, log -P & fixes Junio C Hamano
2017-06-02 16:10   ` Johannes Schindelin
2017-06-02 16:45     ` Ævar Arnfjörð Bjarmason
2017-06-05  0:38       ` Junio C Hamano
2017-06-07 15:50         ` Johannes Schindelin
2017-06-07 16:14           ` Ævar Arnfjörð Bjarmason
2017-06-09 13:09             ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170601182056.31142-7-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=bmwill@google.com \
    --cc=dark.panda@gmail.com \
    --cc=frekui@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=michal.kiedrowicz@gmail.com \
    --cc=noloader@gmail.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=sbeller@google.com \
    --cc=vleschuk@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).