diff options
| author | Frank Li <lznuaa@gmail.com> | 2010-08-17 09:24:40 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:06:54 -0700 |
| commit | de831726decd9c2fcaf7c71136560cf6f5c38a59 (patch) | |
| tree | 1f3bf78b0a2a03bd6268014bb4dad9d831a6b90d | |
| parent | a997bf423d4baac5b2286edccd1cef897108397f (diff) | |
| download | git-de831726decd9c2fcaf7c71136560cf6f5c38a59.tar.gz | |
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>
| -rw-r--r-- | 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 5115d7a0ee..4a80056e1f 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; |