From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 28 Aug 2001 15:04:27 +0000 (+0000)
Subject: Change the conditionals so the mips + gcc code here doesn't apply for Irix.
X-Git-Tag: REL7_2_BETA1~587
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd225655b9bfec02f128b7590be9ad4f44d87aa9;p=postgresql

Change the conditionals so the mips + gcc code here doesn't apply for Irix.
The code in s_lock.h should get used.

report from Bruno Mattarollo <bruno@web1.greenpeace.org>
---

diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c
index eb07e476a9..282273cd6b 100644
--- a/src/backend/storage/buffer/s_lock.c
+++ b/src/backend/storage/buffer/s_lock.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.36 2001/03/27 01:16:24 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.37 2001/08/28 15:04:27 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -228,7 +228,7 @@ success:						\n\
 
 #endif	 /* __powerpc__ */
 
-#if defined(__mips__)
+#if defined(__mips__) || !defined(__sgi)
 static void
 tas_dummy()
 {
@@ -251,9 +251,9 @@ fail:							\n\
 ");
 }
 
-#endif	 /* __mips__ */
+#endif	 /* __mips__ && !__sgi */
 
-#else							/* defined(__GNUC__) */
+#else /* not __GNUC__ */
 /***************************************************************************
  * All non gcc
  */