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 eb07e476a96ee235a016160e2609dbbe8f5a16b5..282273cd6b085594a6e24e154c703a439e336617 100644 (file)
--- 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
  */