Index: src/backend/main/main.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/main/main.c,v
retrieving revision 1.66
diff -c -c -r1.66 main.c
*** src/backend/main/main.c	29 Nov 2003 19:51:49 -0000	1.66
--- src/backend/main/main.c	22 Dec 2003 23:35:40 -0000
***************
*** 23,29 ****
  #include <pwd.h>
  #include <unistd.h>
  
! #if defined(__alpha) && defined(__osf__)
  #include <sys/sysinfo.h>
  #include "machine/hal_sysinfo.h"
  #define ASSEMBLER
--- 23,29 ----
  #include <pwd.h>
  #include <unistd.h>
  
! #if (defined(__alpha) || defined(__alpha__)) && defined(__osf__)
  #include <sys/sysinfo.h>
  #include "machine/hal_sysinfo.h"
  #define ASSEMBLER
***************
*** 63,76 ****
  	 * without help.  Avoid adding more here, if you can.
  	 */
  
! #if defined(__alpha)
  #ifdef NOFIXADE
  	int			buffer[] = {SSIN_UACPROC, UAC_SIGBUS};
  #endif   /* NOFIXADE */
  #ifdef NOPRINTADE
  	int			buffer[] = {SSIN_UACPROC, UAC_NOPRINT};
  #endif   /* NOPRINTADE */
! #endif   /* __alpha */
  
  #if defined(NOFIXADE) || defined(NOPRINTADE)
  
--- 63,76 ----
  	 * without help.  Avoid adding more here, if you can.
  	 */
  
! #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 || __alpha__ */
  
  #if defined(NOFIXADE) || defined(NOPRINTADE)
  
***************
*** 78,84 ****
  	syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL);
  #endif
  
! #if defined(__alpha)
  	if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL,
  				   (unsigned long) NULL) < 0)
  		fprintf(stderr, gettext("%s: setsysinfo failed: %s\n"),
--- 78,84 ----
  	syscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL);
  #endif
  
! #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"),
Index: src/include/storage/s_lock.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/include/storage/s_lock.h,v
retrieving revision 1.117
diff -c -c -r1.117 s_lock.h
*** src/include/storage/s_lock.h	29 Nov 2003 22:41:13 -0000	1.117
--- src/include/storage/s_lock.h	22 Dec 2003 23:35:41 -0000
***************
*** 374,380 ****
   */
  
  
! #if defined(__alpha)
  
  /*
   * Correct multi-processor locking methods are explained in section 5.5.3
--- 374,380 ----
   */
  
  
! #if defined(__alpha) || defined(__alpha__)
  
  /*
   * Correct multi-processor locking methods are explained in section 5.5.3
***************
*** 435,441 ****
  
  #endif	 /* defined(__GNUC__) */
  
! #endif	 /* __alpha */
  
  
  #if defined(__hppa)
--- 435,441 ----
  
  #endif	 /* defined(__GNUC__) */
  
! #endif	 /* __alpha || __alpha__ */
  
  
  #if defined(__hppa)