linuxalpha patches from Ryan Kirkpatrick <rkirkpat@nag.cs.colorado.edu>

scrappy · scrappy · commit a362212a1749 · 1998-04-11T21:14:50.000Z
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.15 1998/03/20 03:55:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.16 1998/04/11 21:14:47 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
-#ifdef alpha
+#if defined(alpha) && !defined(linux)
 #include <sys/sysinfo.h>
 #include <machine/hal_sysinfo.h>
 #define ASSEMBLER
diff --git a/src/template/linuxalpha b/src/template/linuxalpha
@@ -1,5 +1,5 @@
 AROPT:crs
-CFLAGS:-O2 -Dalpha
+CFLAGS:-O2 -Dalpha -Dlinuxalpha
 SHARED_LIB:-fpic
 ALL:
 SRCH_INC:

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,15 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.15 1998/03/20 03:55:38 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.16 1998/04/11 21:14:47 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`	`#include <stdio.h>`
`15`	`15`	`#include <string.h>`
`16`	`16`	`#include <unistd.h>`
`17`	`17`
`18`		`-#ifdef alpha`
	`18`	`+#if defined(alpha) && !defined(linux)`
`19`	`19`	`#include <sys/sysinfo.h>`
`20`	`20`	`#include <machine/hal_sysinfo.h>`
`21`	`21`	`#define ASSEMBLER`