Linux/alpha patch from Dan Maynard

bmomjian · bmomjian · commit 83cd375cd290 · 1997-10-03T15:27:18.000Z
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.9 1997/10/02 18:32:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.10 1997/10/03 15:27:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -97,7 +97,7 @@
  * (see storage/ipc.h).
  */
 
-#if defined(__alpha__) || defined(__alpha)
+#if (defined(__alpha__) || defined(__alpha)) && !defined(linux)
 
 #define	S_LOCK(lock)	do \
 						{ \

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.9 1997/10/02 18:32:58 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.10 1997/10/03 15:27:18 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -97,7 +97,7 @@`
`97`	`97`	`* (see storage/ipc.h).`
`98`	`98`	`*/`
`99`	`99`
`100`		`-#if defined(__alpha__) \|\| defined(__alpha)`
	`100`	`+#if (defined(__alpha__) \|\| defined(__alpha)) && !defined(linux)`
`101`	`101`
`102`	`102`	`#define S_LOCK(lock) do \`
`103`	`103`	`{ \`