summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-02 17:17:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-02 17:17:26 (GMT)
commitbdc4204119d2847ea8f1ae5e44614be859951822 (patch)
treeff641c05a79b4e5eb6d0428a2d6e2c55fe0935e9 /git-compat-util.h
parent225c93a3cac93e8c619e5c8af47d2a781eedcacd (diff)
parent761a889a97a33d277f8a6607a4696164391f9d5d (diff)
downloadgit-bdc4204119d2847ea8f1ae5e44614be859951822.zip
git-bdc4204119d2847ea8f1ae5e44614be859951822.tar.gz
git-bdc4204119d2847ea8f1ae5e44614be859951822.tar.bz2
Merge branch 'maint'
* maint: git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX Documentation: A...B shortcut for checkout and rebase Documentation/pretty-{formats,options}: better reference for "format:<string>"
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index edf352d..c0198dd 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -56,7 +56,7 @@
# define _XOPEN_SOURCE 500
# endif
#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && \
- !defined(_M_UNIX) && !defined(sgi) && !defined(__DragonFly__)
+ !defined(_M_UNIX) && !defined(__sgi) && !defined(__DragonFly__)
#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
#endif