From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Paolo Bonzini" <paolo.bonzini@gmail.com>,
"Andreas Schwab" <schwab@linux-m68k.org>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Frank Li" <lznuaa@gmail.com>,
"Marius Storm-Olsen" <mstormo@gmail.com>,
"Johannes Sixt" <j6t@kdbg.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 3/5] Change regerror() declaration from K&R style to ANSI C (C89)
Date: Tue, 17 Aug 2010 09:24:40 +0000 [thread overview]
Message-ID: <1282037082-12996-4-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <20100817080322.GA28476@burratino>
From: Frank Li <lznuaa@gmail.com>
The MSVC headers typedef errcode as int, and thus confused the compiler in
the K&R style definition. ANSI style deconfuses it.
This patch was originally applied as v1.6.5-rc2~23 but needs to be
re-applied since compat/regex was overwritten by Ævar Arnfjörð
Bjarmason with the gawk regex engine.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
compat/regex/regcomp.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
index 5115d7a..647c22a 100644
--- a/compat/regex/regcomp.c
+++ b/compat/regex/regcomp.c
@@ -546,11 +546,8 @@ weak_alias (__regcomp, regcomp)
from either regcomp or regexec. We don't use PREG here. */
size_t
-regerror (errcode, preg, errbuf, errbuf_size)
- int errcode;
- const regex_t *__restrict preg;
- char *__restrict errbuf;
- size_t errbuf_size;
+regerror(int errcode, const regex_t *__restrict preg,
+ char *__restrict errbuf, size_t errbuf_size)
{
const char *msg;
size_t msg_size;
--
1.7.2.1.389.gc3d0b
next prev parent reply other threads:[~2010-08-17 9:26 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-08 0:42 [PATCH] grep: Don't pass a TODO test if REG_STARTEND is supported Ævar Arnfjörð Bjarmason
2010-07-08 19:40 ` Junio C Hamano
2010-07-08 20:09 ` Ævar Arnfjörð Bjarmason
2010-07-08 21:58 ` René Scharfe
2010-07-15 15:32 ` Ævar Arnfjörð Bjarmason
2010-07-15 17:47 ` Junio C Hamano
2010-07-15 18:44 ` Ævar Arnfjörð Bjarmason
[not found] ` <20100715220059.GA3312@burratino>
2010-07-16 13:58 ` [RFC/PATCH] Update compat/regex Ævar Arnfjörð Bjarmason
2010-07-16 14:17 ` Andreas Schwab
2010-08-15 11:08 ` Ævar Arnfjörð Bjarmason
2010-08-16 12:26 ` Paolo Bonzini
2010-08-17 3:25 ` [PATCH/RFC 0/3] " Ævar Arnfjörð Bjarmason
2010-08-17 3:25 ` [PATCH/RFC 2/3] compat/regex: hacks to get the gawk regex engine to compile within git Ævar Arnfjörð Bjarmason
2010-08-17 3:35 ` Jonathan Nieder
2010-08-17 3:25 ` [PATCH/RFC 3/3] t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND Ævar Arnfjörð Bjarmason
[not found] ` <1282015548-19074-2-git-send-email-avarab@gmail.com>
2010-08-17 3:37 ` [PATCH/RFC 1/3] compat/regex: use the regex engine from gawk for compat Jonathan Nieder
2010-08-17 3:50 ` Ævar Arnfjörð Bjarmason
2010-08-17 4:08 ` Jonathan Nieder
2010-08-17 5:17 ` [PATCH/RFC v2 0/3] Update compat/regex Ævar Arnfjörð Bjarmason
2010-08-17 8:03 ` Jonathan Nieder
2010-08-17 9:24 ` [PATCH 0/5] " Ævar Arnfjörð Bjarmason
2010-08-17 11:46 ` Paolo Bonzini
2010-08-17 23:19 ` Junio C Hamano
2010-08-17 23:50 ` Jonathan Nieder
2010-08-18 10:41 ` Ævar Arnfjörð Bjarmason
2010-08-17 9:24 ` [PATCH 2/5] compat/regex: get the gawk regex engine to compile within git Ævar Arnfjörð Bjarmason
2010-08-17 9:24 ` Ævar Arnfjörð Bjarmason [this message]
2010-08-17 9:24 ` [PATCH 4/5] t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND Ævar Arnfjörð Bjarmason
2010-08-17 9:24 ` [PATCH 5/5] autoconf: don't use platform regex if it lacks REG_STARTEND Ævar Arnfjörð Bjarmason
2010-08-17 5:17 ` [PATCH/RFC v2 2/3] compat/regex: get the gawk regex engine to compile within git Ævar Arnfjörð Bjarmason
2010-08-17 5:17 ` [PATCH/RFC v2 3/3] t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND Ævar Arnfjörð Bjarmason
2010-07-16 14:33 ` [PATCH] grep: Don't pass a TODO test if REG_STARTEND is supported Ævar Arnfjörð Bjarmason
2010-07-16 19:50 ` Jonathan Nieder
2010-07-16 20:51 ` Ævar Arnfjörð Bjarmason
2010-07-16 21:06 ` Jonathan Nieder
2010-07-16 21:19 ` Ævar Arnfjörð Bjarmason
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1282037082-12996-4-git-send-email-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=lznuaa@gmail.com \
--cc=mstormo@gmail.com \
--cc=paolo.bonzini@gmail.com \
--cc=schwab@linux-m68k.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.