From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 6ABB32018D for ; Thu, 11 May 2017 17:02:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933140AbdEKRCl (ORCPT ); Thu, 11 May 2017 13:02:41 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:36660 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933121AbdEKRCh (ORCPT ); Thu, 11 May 2017 13:02:37 -0400 Received: by mail-qk0-f196.google.com with SMTP id y128so4483297qka.3 for ; Thu, 11 May 2017 10:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lq+2/Mo2yDorJ0O3vWFcbpiGK2EtMtlzZ6uviMlAqaY=; b=d9mcpo3H/bp2CPJoUSOEXVLNE1CIQB7z/IXyXcDCMvj+9FRfdHzDjqlcplBpTR5o9I ZkdRVVLF+b9ALjz1OEXET2vfHMdzOlRkr7S+A/LEu6B0GHJmmHFTognZ+UgXZey/IPlz 1mUGGaiOgGPkGLxC85ZoGsEQfEzQGm5IprOEFPchV+eSvFX9F3vHyh0+6MedUmsSdJlG PL6Wiflo+ST4i4UG6krUJgIKcAW0swnrBHQRb+MLPDjD/Je5/9gybVPrkwHvEzCmxrFh 8Cj0UUHE7uJiNFmuYvjNpWJ2XZcrc67jGKSRkntMjGxTDAjzSKsrHzmzLB5WuKBi6OkW EHvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lq+2/Mo2yDorJ0O3vWFcbpiGK2EtMtlzZ6uviMlAqaY=; b=aku0No1gywg60v8w4BjgZ2MAnEFZZegcssVQ2F6dQRXGiWpfuSXVRHR8oLaZX6QMV5 HLnkpAfFv0jtejZPbBsEziKxsT0Y0aQfDBXslicLd4K5S/Rs1EY/hBz5cOR7EHNNrauh 83KEDMUjnb1b6bNrVBeEcvplfEIkVHmop2M/YhuDcqj2UZyAoxKON/nBox03WW8O4NnZ dpoNyE9au2OXRAPuvhLAojHOBDQcqOvoIM/d3j9HVMJziUp704S6s635y93eZNVpjZ10 3Jjb/bQ8w7N6Br3/ZC57Cc/8oN0qbAUB7FlMVldW49IJS5t6MLTZHuyTKvtYGHAYKNB1 bh/A== X-Gm-Message-State: AODbwcApxEefeMm7Btl81arGrX5eBUE/GoNkceaExrcccrRMqCTaaKlY Or2kcV23L0nrRw== X-Received: by 10.55.217.155 with SMTP id q27mr100886qkl.217.1494522156473; Thu, 11 May 2017 10:02:36 -0700 (PDT) Received: from u.nix.is ([2a01:4f8:190:5095::2]) by smtp.gmail.com with ESMTPSA id l10sm480407qte.15.2017.05.11.10.02.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 May 2017 10:02:35 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Jeffrey Walton , =?UTF-8?q?Micha=C5=82=20Kiedrowicz?= , J Smith , Victor Leschuk , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Fredrik Kuivinen , Brandon Williams , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH 6/7] grep: un-break building with PCRE < 8.20 Date: Thu, 11 May 2017 17:01:41 +0000 Message-Id: <20170511170142.15934-7-avarab@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170511170142.15934-1-avarab@gmail.com> References: <20170511170142.15934-1-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- grep.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/grep.h b/grep.h index 73ef0ef8ec..b7b9d487b0 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.11.0