Must test for __hppa__ as well as __hppa to make linux-hppa happy.

tglsfdc · tglsfdc · commit 037e2fcf8fb4 · 2004-01-03T05:47:44.000Z
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
@@ -66,7 +66,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	  $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.124 2003/12/27 20:58:58 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.125 2004/01/03 05:47:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -510,7 +510,7 @@ typedef unsigned long slock_t;
 #endif	 /* __alpha || __alpha__ */
 
 
-#if defined(__hppa)
+#if defined(__hppa) || defined(__hppa__)
 /*
  * HP's PA-RISC
  *
@@ -560,7 +560,7 @@ tas(volatile slock_t *lock)
 
 #define S_LOCK_FREE(lock)	(*TAS_ACTIVE_WORD(lock) != 0)
 
-#endif	 /* __hppa */
+#endif	 /* __hppa || __hppa__ */
 
 
 #if defined(__QNX__) && defined(__WATCOMC__)

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`67`	`67`	`* Portions Copyright (c) 1994, Regents of the University of California`
`68`	`68`	`*`
`69`		`- * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.124 2003/12/27 20:58:58 tgl Exp $`
	`69`	`+ * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.125 2004/01/03 05:47:44 tgl Exp $`
`70`	`70`	`*`
`71`	`71`	`*-------------------------------------------------------------------------`
`72`	`72`	`*/`
`@@ -510,7 +510,7 @@ typedef unsigned long slock_t;`
`510`	`510`	`#endif /* __alpha \|\| __alpha__ */`
`511`	`511`
`512`	`512`
`513`		`-#if defined(__hppa)`
	`513`	`+#if defined(__hppa) \|\| defined(__hppa__)`
`514`	`514`	`/*`
`515`	`515`	`* HP's PA-RISC`
`516`	`516`	`*`
`@@ -560,7 +560,7 @@ tas(volatile slock_t *lock)`
`560`	`560`
`561`	`561`	`#define S_LOCK_FREE(lock) (*TAS_ACTIVE_WORD(lock) != 0)`
`562`	`562`
`563`		`-#endif /* __hppa */`
	`563`	`+#endif /* __hppa \|\| __hppa__ */`
`564`	`564`
`565`	`565`
`566`	`566`	`#if defined(__QNX__) && defined(__WATCOMC__)`