Merge branch 'ab/sun-studio-portability'
commit35726681d5fd6bde44a18b4aec3cf04258d0b44e
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 23:30:33 +0000 (22 15:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 23:30:33 +0000 (22 15:30 -0800)
tree217b0c1e4d7ab8c160451be5ad42711f46602bfc
parentf0ede8435ab161b3aba3e5e306239d6bd74dd9b8
parentab1900a36ef7fcfe872ff9d0803f9442e356c2f0
Merge branch 'ab/sun-studio-portability'

* ab/sun-studio-portability:
  Appease Sun Studio by renaming "tmpfile"
  Fix a bitwise negation assignment issue spotted by Sun Studio
  Fix an enum assignment issue spotted by Sun Studio