Wrap the function in and #ifdef, not the header files

scrappy · scrappy · commit 7a2a7d436dac · 1998-01-07T17:02:52.000Z
Should fix an AIX compiler problem
diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.1 1997/12/30 04:03:01 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.2 1998/01/07 17:02:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
  *         to the assembly code involved.
  */
 
-#if defined(__alpha__) && defined(linux)
 
 #include <sys/types.h>
 #include <sys/file.h>
@@ -38,6 +37,7 @@
 #include "storage/ipc.h"
 #include "storage/s_lock.h"
 
+#if defined(__alpha__) && defined(linux)
 void S_LOCK(slock_t* lock)
 {
   do
@@ -61,5 +61,4 @@ void S_LOCK(slock_t* lock)
     } while (_res != 0);
   } while (0);
 }
-
 #endif

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/backend/storage/buffer/Attic/s_lock.c,v 1.1 1997/12/30 04:03:01 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.2 1998/01/07 17:02:52 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -18,7 +18,6 @@`
`18`	`18`	`* to the assembly code involved.`
`19`	`19`	`*/`
`20`	`20`
`21`		`-#if defined(__alpha__) && defined(linux)`
`22`	`21`
`23`	`22`	`#include <sys/types.h>`
`24`	`23`	`#include <sys/file.h>`
`@@ -38,6 +37,7 @@`
`38`	`37`	`#include "storage/ipc.h"`
`39`	`38`	`#include "storage/s_lock.h"`
`40`	`39`
	`40`	`+#if defined(__alpha__) && defined(linux)`
`41`	`41`	`void S_LOCK(slock_t* lock)`
`42`	`42`	`{`
`43`	`43`	`do`
`@@ -61,5 +61,4 @@ void S_LOCK(slock_t* lock)`
`61`	`61`	`} while (_res != 0);`
`62`	`62`	`} while (0);`
`63`	`63`	`}`
`64`		`-`
`65`	`64`	`#endif`