[PATCH] git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX

From: Brandon Casey <casey@nrlssc.navy.mil>
Date: Jun 2, 2010, 01:55 UTC
Message-ID: <4gJWLBIdRVtK7gq22o-LadCixyvOA-9FlEvk-ZrCHyUsGwArvR9oPkV-qlez-T-Nsn0v6UO633Y@cipher.nrlssc.navy.mil>
In-Reply-To: <20100514093838.421864000@mlists.thewrittenword.com>

From: Gary V. Vaughan <git@mlists.thewrittenword.com>

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>
---

Hi Gary,

Here's a resubmit of your patch with an updated commit message. Since the __sgi macro seems to be more common than the sgi macro, I modified your patch to check for only the __sgi macro. I know Junio suggested checking for both macros, but I'm the one that Junio was talking about when he made his comments, and __sgi works for me.

It's such a simple little patch, but still I removed your signed-off-by line since I modified the patch, and I am not you. Please do reply to this message with a signed-off-by if you sign off on the patch. Junio will add it to the patch when he applies the it.

-brandon

 git-compat-util.h |    2 +-
 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

-- 
1.6.6.2