From: Johannes Sixt <j6t@kdbg.org>
To: Philip Oakley <philipoakley@iee.org>
Cc: GitList <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
git-for-windows <git-for-windows@googlegroups.com>
Subject: Re: [git-for-windows] [PATCH] exec_cmd.c, sideband.c, Makefile: avoid multiple PREFIX definitions
Date: Fri, 6 May 2016 08:18:11 +0200 [thread overview]
Message-ID: <572C3723.8010508@kdbg.org> (raw)
In-Reply-To: <1462483733-3496-2-git-send-email-philipoakley@iee.org>
Am 05.05.2016 um 23:28 schrieb Philip Oakley:
> The short and sweet PREFIX can be confused when used in many places.
>
> Rename both usages to better describe their purpose.
>
> Noticed when compiling Git for Windows using MSVC/Visual Studio which
> reports the conflict beteeen the command line definition and the
> definition in sideband.c
You should describe the circumstances better under which you notice a
conflict, because there is no conflict when Git is built with the
Makefile and 'make':
> diff --git a/Makefile b/Makefile
> index 33b0f76..bcdd3ec 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1973,7 +1973,7 @@ exec_cmd.sp exec_cmd.s exec_cmd.o: GIT-PREFIX
> exec_cmd.sp exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \
> '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
> '-DBINDIR="$(bindir_relative_SQ)"' \
> - '-DPREFIX="$(prefix_SQ)"'
> + '-DEXEC_PREFIX="$(prefix_SQ)"'
Notice that PREFIX is set only for a small subset of .c files.
sideband.c is not among them.
-- Hannes
next prev parent reply other threads:[~2016-05-06 6:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-05 21:28 [PATCH] Conflicting PREFIX usage Philip Oakley
2016-05-05 21:28 ` [PATCH] exec_cmd.c, sideband.c, Makefile: avoid multiple PREFIX definitions Philip Oakley
2016-05-05 22:02 ` Junio C Hamano
2016-05-06 7:23 ` Philip Oakley
2016-05-06 16:55 ` Junio C Hamano
2016-05-06 6:18 ` Johannes Sixt [this message]
2016-05-06 7:31 ` [git-for-windows] " Philip Oakley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=572C3723.8010508@kdbg.org \
--to=j6t@kdbg.org \
--cc=git-for-windows@googlegroups.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=philipoakley@iee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.