Subject: Re: "trace.c", line 219: error: identifier redeclared: trace_strbuf

From: dev <[email-masked]>
Date: Sun, 7 Sep 2014 13:19:19 -0400 (EDT)

On September 6, 2014 at 4:53 PM "René Scharfe" <[email-masked]> wrote:
> Am 06.09.2014 um 21:26 schrieb dev:
> >
> >
<snip>
> >
> > Solaris 10 with Oracle Studio 12.3 compiler tools. A lengthy
> > maillist
> > discussion last week sorted out the previous release of git just
> > fine however this release fails to build.
> >
>
> The issue was introduced with e05bed96 (trace: add 'file:line' to all
> trace output).
>
> -- >8 --
> Subject: [PATCH] trace: correct trace_strbuf() parameter type for
> !HAVE_VARIADIC_MACROS
>
> Reported-by: dev <[email-masked]>
> Signed-off-by: Rene Scharfe <[email-masked]>
> ---
>  trace.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/trace.c b/trace.c
> index 54aaee5..b6f25a2 100644
> --- a/trace.c
> +++ b/trace.c
> @@ -216,7 +216,7 @@ void trace_argv_printf(const char **argv, const
> char *format, ...)
>    va_end(ap);
>  }
> 
> -void trace_strbuf(const char *key, const struct strbuf *data)
> +void trace_strbuf(struct trace_key *key, const struct strbuf *data)
>  {
>    trace_strbuf_fl(NULL, 0, key, data);
>  }
> --
> 2.1.0
>

Thank you for the reply and the info.  I backed that out and things get
worse :

$ diff -h trace.c.backup trace.c
219,221c219,221
< void trace_strbuf(const char *key, const struct strbuf *data)
< {
<       trace_strbuf_fl(NULL, 0, key, data);
---
> void trace_strbuf(struct trace_key *key, const struct strbuf *data)
> {
>         trace_strbuf_fl(NULL, 0, key, data);

$ gmake CFLAGS="$CFLAGS" LDFLAGS="$LD_OPTIONS" NEEDS_LIBICONV=Yes \
> SHELL_PATH=/usr/local/bin/bash \
> SANE_TOOL_PATH=/usr/local/bin \
> USE_LIBPCRE=1 LIBPCREDIR=/usr/local CURLDIR=/usr/local \
> EXPATDIR=/usr/local NEEDS_LIBINTL_BEFORE_LIBICONV=1 \
> NEEDS_SOCKET=1 NEEDS_RESOLV=1 USE_NSEC=1 \
> PERL_PATH=/usr/local/bin/perl \
> TAR=/usr/bin/tar \
> NO_PYTHON=1 DEFAULT_PAGER=/usr/xpg4/bin/more \
> DEFAULT_EDITOR=/usr/local/bin/vim DEFAULT_HELP_FORMAT=man \
> prefix=/usr/local
    CC trace.o
"trace.c", line 390: error: reference to static identifier "offset" in
extern inline function
"trace.c", line 392: error: reference to static identifier "offset" in
extern inline function
"trace.c", line 393: error: reference to static identifier "offset" in
extern inline function
"trace.c", line 401: error: reference to static identifier "offset" in
extern inline function
"trace.c", line 403: error: reference to static identifier "offset" in
extern inline function
cc: acomp failed for trace.c
gmake: *** [trace.o] Error 2
$

So is there a possible 2.1.1 coming along shortly ?

dev