From b731d04101072e7d720c79bd32a0eda80411901c Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 22 Dec 2003 23:36:38 +0000
Subject: [PATCH] Test for __alpha and __alpha__.
---
src/backend/main/main.c | 10 +++++-----
src/include/storage/s_lock.h | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index dbf6a60ac2f..4fa07b29dc9 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -13,7 +13,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.66 2003/11/29 19:51:49 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.67 2003/12/22 23:36:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,7 @@
#include <pwd.h>
#include <unistd.h>
-#if defined(__alpha) && defined(__osf__)
+#if (defined(__alpha) || defined(__alpha__)) && defined(__osf__)
#include <sys/sysinfo.h>
#include "machine/hal_sysinfo.h"
#define ASSEMBLER
@@ -63,14 +63,14 @@ main(int argc, char *argv[])
* without help. Avoid adding more here, if you can.
*/
-#if defined(__alpha)
+#if defined(__alpha) || defined(__alpha__)
#ifdef NOFIXADE
int buffer[] = {SSIN_UACPROC, UAC_SIGBUS};
#endif /* NOFIXADE */
#ifdef NOPRINTADE
int buffer[] = {SSIN_UACPROC, UAC_NOPRINT};
#endif /* NOPRINTADE */
-#endif /* __alpha */
+#endif /* __alpha || __alpha__ */
#if defined(NOFIXADE) || defined(NOPRINTADE)
@@ -78,7 +78,7 @@ main(int argc, char *argv[])
syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL);
#endif
-#if defined(__alpha)
+#if defined(__alpha) || defined(__alpha__)
if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL,
(unsigned long) NULL) < 0)
fprintf(stderr, gettext("%s: setsysinfo failed: %s\n"),
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 3717a9f05f9..a6d6006b081 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -63,7 +63,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.117 2003/11/29 22:41:13 pgsql Exp $
+ * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.118 2003/12/22 23:36:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -374,7 +374,7 @@ tas(volatile slock_t *s_lock)
*/
-#if defined(__alpha)
+#if defined(__alpha) || defined(__alpha__)
/*
* Correct multi-processor locking methods are explained in section 5.5.3
@@ -435,7 +435,7 @@ tas(volatile slock_t *lock)
#endif /* defined(__GNUC__) */
-#endif /* __alpha */
+#endif /* __alpha || __alpha__ */
#if defined(__hppa)
--
GitLab