Re: [PATCH] compat/regex: define out variables only used under RE_ENABLE_I18N

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 19, 2010, 20:02 UTC
Message-ID: <7vtymq74mp.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1282242601-2630-1-git-send-email-avarab@gmail.com>

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

Show 5 quoted lines

> Wrap variables that were only used RE_ENABLE_I18N in `#ifdef
> RE_ENABLE_I18N`. This eliminates compiler warnings when compiling with
> NO_REGEX=YesPlease.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

Hmm, this unfortunately is not enough for me to compile it locally.

In file included from compat/regex/regex.c:77: compat/regex/regcomp.c: In function 're_compile_pattern': compat/regex/regcomp.c:237: error: old-style function definition compat/regex/regcomp.c: In function 're_set_syntax': compat/regex/regcomp.c:276: error: old-style function definition compat/regex/regcomp.c: In function 're_compile_fastmap': compat/regex/regcomp.c:289: error: old-style function definition compat/regex/regcomp.c: In function 'regcomp': compat/regex/regcomp.c:491: error: old-style function definition compat/regex/regcomp.c: In function 'regfree': compat/regex/regcomp.c:655: error: old-style function definition In file included from compat/regex/regex.c:78: compat/regex/regexec.c: In function 'regexec': compat/regex/regexec.c:227: error: old-style function definition compat/regex/regexec.c: In function 're_match': compat/regex/regexec.c:311: error: old-style function definition compat/regex/regexec.c: In function 're_search': compat/regex/regexec.c:324: error: old-style function definition compat/regex/regexec.c: In function 're_match_2': compat/regex/regexec.c:337: error: old-style function definition compat/regex/regexec.c: In function 're_search_2': compat/regex/regexec.c:351: error: old-style function definition compat/regex/regexec.c: In function 're_search_2_stub': compat/regex/regexec.c:366: error: old-style function definition compat/regex/regexec.c: In function 're_search_stub': compat/regex/regexec.c:410: error: old-style function definition compat/regex/regexec.c: In function 're_copy_regs': compat/regex/regexec.c:497: error: old-style function definition compat/regex/regexec.c: In function 're_set_registers': compat/regex/regexec.c:578: error: old-style function definition compat/regex/regexec.c: In function 're_search_internal': compat/regex/regexec.c:631: error: old-style function definition compat/regex/regexec.c: In function 'prune_impossible_nodes': compat/regex/regexec.c:952: error: old-style function definition make: *** [compat/regex/regex.o] Error 1

The fix should be straightforward, and I think it should be squashed with the header ANSIfication you sent earlier.

Thanks.