Change the conditionals so the mips + gcc code here doesn't apply for Irix.

petere · petere · commit dd225655b9bf · 2001-08-28T15:04:27.000Z
The code in s_lock.h should get used.

report from Bruno Mattarollo &lt;bruno@web1.greenpeace.org&gt;
diff --git 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
  */

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.36 2001/03/27 01:16:24 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.37 2001/08/28 15:04:27 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -228,7 +228,7 @@ success: \n\`
`228`	`228`
`229`	`229`	`#endif /* __powerpc__ */`
`230`	`230`
`231`		`-#if defined(__mips__)`
	`231`	`+#if defined(__mips__) \|\| !defined(__sgi)`
`232`	`232`	`static void`
`233`	`233`	`tas_dummy()`
`234`	`234`	`{`
`@@ -251,9 +251,9 @@ fail: \n\`
`251`	`251`	`");`
`252`	`252`	`}`
`253`	`253`
`254`		`-#endif /* __mips__ */`
	`254`	`+#endif /* __mips__ && !__sgi */`
`255`	`255`
`256`		`-#else /* defined(__GNUC__) */`
	`256`	`+#else /* not __GNUC__ */`
`257`	`257`	`/***************************************************************************`
`258`	`258`	`* All non gcc`
`259`	`259`	`*/`