From: Ævar Arnfjörð Bjarmason Date: Tue, 17 Aug 2010 09:24:40 GMT Subject: [PATCH 3/5] Change regerror() declaration from K&R style to ANSI C (C89) Message-ID: <1282037082-12996-4-git-send-email-avarab@gmail.com> In-Reply-To: <20100817080322.GA28476@burratino> From: Frank Li 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 Signed-off-by: Marius Storm-Olsen Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano Signed-off-by: Ævar Arnfjörð Bjarmason --- 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