diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-12-21 01:18:21 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-12-21 10:21:04 -0800 |
| commit | ab1900a36ef7fcfe872ff9d0803f9442e356c2f0 (patch) | |
| tree | 1a53b9468bec2d490037f488c3e731892cbef691 /builtin/merge-ours.c | |
| parent | Fix a bitwise negation assignment issue spotted by Sun Studio (diff) | |
| download | tgif-ab1900a36ef7fcfe872ff9d0803f9442e356c2f0.tar.xz | |
Appease Sun Studio by renaming "tmpfile"
On Solaris the system headers define the "tmpfile" name, which'll
cause Git compiled with Sun Studio 12 Update 1 to whine about us
redefining the name:
"pack-write.c", line 76: warning: name redefined by pragma redefine_extname declared static: tmpfile (E_PRAGMA_REDEFINE_STATIC)
"sha1_file.c", line 2455: warning: name redefined by pragma redefine_extname declared static: tmpfile (E_PRAGMA_REDEFINE_STATIC)
"fast-import.c", line 858: warning: name redefined by pragma redefine_extname declared static: tmpfile (E_PRAGMA_REDEFINE_STATIC)
"builtin/index-pack.c", line 175: warning: name redefined by pragma redefine_extname declared static: tmpfile (E_PRAGMA_REDEFINE_STATIC)
Just renaming the "tmpfile" variable to "tmp_file" in the relevant
places is the easiest way to fix this.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions