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

diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 91ec815d8e01da7f5c1bc545a79ae1c48567c386..a654163cb86bb4176033acf82c1914b729bb25b3 100644 (file)
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -7,7 +7,7 @@
  *
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,7 @@
 #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
index 8a68ee4e9dc44e42ae44074fcab14ecd1d954a0d..163e1a6ee48cdc05425d6ce5bd8c8d6308ceee1a 100644 (file)
--- 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: