summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Gary V. Vaughan <git@mlists.thewrittenword.com>2010-06-01 20:55:36 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-02 10:03:53 -0700
commit761a889a97a33d277f8a6607a4696164391f9d5d (patch)
treeda804f30d6063b18d6a7cd81a9df8dd75160621b /builtin/merge-index.c
parentDocumentation: A...B shortcut for checkout and rebase (diff)
downloadtgif-761a889a97a33d277f8a6607a4696164391f9d5d.tar.xz
git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX
IRIX 6.5.26m does not define the 'sgi' macro, but it does define an '__sgi' macro. Since later IRIX versions (6.5.29m) define both macros, and since an underscore prefixed macro is preferred anyway, use '__sgi' to detect compilation on SGI IRIX. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions