Change regerror() declaration from K&R style to ANSI C (C89)
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Frank Li committed
Aug 17, 2010 at 09:24 UTC
de831726decd9c2fcaf7c71136560cf6f5c38a59
1 file changed
+2
-5
compat/regex/regcomp.c
+2
-5
@@ -546,11 +546,8 @@ weak_alias (__regcomp, regcomp)
546
from either regcomp or regexec. We don't use PREG here. */
547
548
size_t
549
-regerror (errcode, preg, errbuf, errbuf_size)
550
- int errcode;
551
- const regex_t *__restrict preg;
552
- char *__restrict errbuf;
553
- size_t errbuf_size;
549
+regerror(int errcode, const regex_t *__restrict preg,
550
+ char *__restrict errbuf, size_t errbuf_size)
551
{
552
const char *msg;
553
size_t msg_size;