summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Michal Rokos <rokos@nextsoft.cz>2011-03-07 13:13:15 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-08 10:58:00 -0800
commitb6ab349b184b3a33c7bcc03521dafed3f9df380a (patch)
tree026941f6103671b97a53ff817b542064357e0410 /builtin/merge-ours.c
parentMakefile: add NO_FNMATCH_CASEFOLD to HP-UX section (diff)
downloadtgif-b6ab349b184b3a33c7bcc03521dafed3f9df380a.tar.xz
git-compat-util.h: Honor HP C's noreturn attribute
HP C for Integrity servers (Itanium) gained support for noreturn attribute sometime in 2006. It was released in Compiler Version A.06.10 and made available in July 2006. The __HP_cc define detects the HP C compiler version. Precede the __GNUC__ check so it works well when compiling with HP C using -Agcc option that enables partial support for the GNU C dialect. The -Agcc defines the __GNUC__ too. Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions