summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2009-06-05 18:36:14 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-06-06 13:21:49 -0700
commitb213019c00740289997f12e5f53b1baae588ac8a (patch)
treee8af83f28bb6e5c0527d4a2d457dd9a2ae069394 /xdiff/xmerge.c
parentgit-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris (diff)
downloadtgif-b213019c00740289997f12e5f53b1baae588ac8a.tar.xz
Makefile: define __sun__ on SunOS
The SUNWspro compiler does not define __sun__ (like GCC does). A check of this macro was recently added to detect compilation on SunOS and to modify the handling of the NO_ICONV and _XOPEN_SOURCE feature macros. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions