diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-12-21 01:18:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-21 18:21:04 (GMT) |
| commit | ab1900a36ef7fcfe872ff9d0803f9442e356c2f0 (patch) | |
| tree | 1a53b9468bec2d490037f488c3e731892cbef691 /pack-write.c | |
| parent | 952fba9c63417d19e01fdf0b714f01b8ae9f3618 (diff) | |
| download | git-ab1900a36ef7fcfe872ff9d0803f9442e356c2f0.zip git-ab1900a36ef7fcfe872ff9d0803f9442e356c2f0.tar.gz git-ab1900a36ef7fcfe872ff9d0803f9442e356c2f0.tar.bz2 | |
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 'pack-write.c')
| -rw-r--r-- | pack-write.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pack-write.c b/pack-write.c index de2bd01..ca9e63b 100644 --- a/pack-write.c +++ b/pack-write.c @@ -73,9 +73,9 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec f = sha1fd_check(index_name); } else { if (!index_name) { - static char tmpfile[PATH_MAX]; - fd = odb_mkstemp(tmpfile, sizeof(tmpfile), "pack/tmp_idx_XXXXXX"); - index_name = xstrdup(tmpfile); + static char tmp_file[PATH_MAX]; + fd = odb_mkstemp(tmp_file, sizeof(tmp_file), "pack/tmp_idx_XXXXXX"); + index_name = xstrdup(tmp_file); } else { unlink(index_name); fd = open(index_name, O_CREAT|O_EXCL|O_WRONLY, 0600); |