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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html