diff --git a/src/backend/port/dynloader/bsd.c b/src/backend/port/dynloader/bsd.c
index c54b2e0023..30bb46473a 100644
--- a/src/backend/port/dynloader/bsd.c
+++ b/src/backend/port/dynloader/bsd.c
@@ -61,7 +61,7 @@ BSD44_derived_dlerror(void)
 void *
 BSD44_derived_dlopen(const char *file, int num)
 {
-#if defined(__mips__) || (defined(__NetBSD__) && defined(vax))
+#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__))
 	sprintf(error_message, "dlopen (%s) not supported", file);
 	return NULL;
 #else
@@ -76,7 +76,7 @@ BSD44_derived_dlopen(const char *file, int num)
 void *
 BSD44_derived_dlsym(void *handle, const char *name)
 {
-#if defined(__mips__) || (defined(__NetBSD__) && defined(vax))
+#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__))
 	sprintf(error_message, "dlsym (%s) failed", name);
 	return NULL;
 #elif defined(__ELF__)
@@ -99,7 +99,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 void
 BSD44_derived_dlclose(void *handle)
 {
-#if defined(__mips__) || (defined(__NetBSD__) && defined(vax))
+#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__))
 #else
 	dlclose(handle);
 #endif
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c
index 0b5e327de4..4e12b823c4 100644
--- a/src/backend/port/dynloader/freebsd.c
+++ b/src/backend/port/dynloader/freebsd.c
@@ -61,7 +61,7 @@ BSD44_derived_dlerror(void)
 void *
 BSD44_derived_dlopen(const char *file, int num)
 {
-#if defined(__mips__) || (defined(__NetBSD__) && defined(vax))
+#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__))
 	sprintf(error_message, "dlopen (%s) not supported", file);
 	return NULL;
 #else
@@ -76,7 +76,7 @@ BSD44_derived_dlopen(const char *file, int num)
 void *
 BSD44_derived_dlsym(void *handle, const char *name)
 {
-#if defined(__mips__) || (defined(__NetBSD__) && defined(vax))
+#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__))
 	sprintf(error_message, "dlsym (%s) failed", name);
 	return NULL;
 #else
@@ -99,7 +99,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 void
 BSD44_derived_dlclose(void *handle)
 {
-#if defined(__mips__) || (defined(__NetBSD__) && defined(vax))
+#if defined(__mips__) || (defined(__NetBSD__) && defined(__vax__))
 #else
 	dlclose(handle);
 #endif
diff --git a/src/include/c.h b/src/include/c.h
index bd14eaa531..84516a0f8f 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.58 1999/07/01 19:47:25 momjian Exp $
+ * $Id: c.h,v 1.59 1999/07/13 20:00:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -759,7 +759,7 @@ extern char *vararg_format(const char *fmt,...);
 #endif	 /* hpux */
 #endif
 
-#if defined(sun) && defined(sparc) && !defined(__SVR4)
+#if defined(sun) && defined(__sparc__) && !defined(__SVR4)
 #define memmove(d, s, l)		bcopy(s, d, l)
 #include <unistd.h>
 #include <varargs.h>
diff --git a/src/include/port/bsd.h b/src/include/port/bsd.h
index 68858e5ff1..9b8b0b6542 100644
--- a/src/include/port/bsd.h
+++ b/src/include/port/bsd.h
@@ -1,16 +1,16 @@
 #define USE_POSIX_TIME
 
-#if defined(i386)
+#if defined(__i386__)
 #define NEED_I386_TAS_ASM
 #define HAS_TEST_AND_SET
 #endif
 
-#if defined(sparc)
+#if defined(__sparc__)
 #define NEED_SPARC_TAS_ASM
 #define HAS_TEST_AND_SET
 #endif
 
-#if defined(vax)
+#if defined(__vax__)
 #define NEED_VAX_TAS_ASM
 #define HAS_TEST_AND_SET
 #endif
diff --git a/src/include/port/bsdi.h b/src/include/port/bsdi.h
index 617ef6768a..cef69b8dc5 100644
--- a/src/include/port/bsdi.h
+++ b/src/include/port/bsdi.h
@@ -1,7 +1,7 @@
-#if defined(i386)
+#if defined(__i386__)
 #define NEED_I386_TAS_ASM
 #endif
-#if defined(sparc)
+#if defined(__sparc__)
 #define NEED_SPARC_TAS_ASM
 #endif
 #define USE_POSIX_TIME
diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h
index 4e754e77de..5e3af51cbc 100644
--- a/src/include/port/freebsd.h
+++ b/src/include/port/freebsd.h
@@ -1,16 +1,16 @@
 #define USE_POSIX_TIME
 
-#if defined(i386)
+#if defined(__i386__)
 #define NEED_I386_TAS_ASM
 #define HAS_TEST_AND_SET
 #endif
 
-#if defined(sparc)
+#if defined(__sparc__)
 #define NEED_SPARC_TAS_ASM
 #define HAS_TEST_AND_SET
 #endif
 
-#if defined(vax)
+#if defined(__vax__)
 #define NEED_VAX_TAS_ASM
 #define HAS_TEST_AND_SET
 #endif
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 2780152f69..85561a60da 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.61 1999/06/13 00:07:43 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.62 1999/07/13 20:00:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -108,7 +108,7 @@ __asm__("    ldq   $0, %0              \n\
 
 
 
-#if defined(i386)
+#if defined(__i386__)
 #define TAS(lock) tas(lock)
 
 static __inline__ int
@@ -120,7 +120,7 @@ __asm__("lock; xchgb %0,%1": "=q"(_res), "=m"(*lock):"0"(_res));
 	return (int) _res;
 }
 
-#endif	 /* i386 */
+#endif	 /* __i386__ */
 
 
 
@@ -140,7 +140,7 @@ __asm__("swpb %0, %0, [%3]": "=r"(_res), "=m"(*lock):"0"(_res), "r" (lock));
 
 
 
-#if defined(sparc)
+#if defined(__sparc__)
 #define TAS(lock) tas(lock)
 
 static __inline__ int
@@ -154,7 +154,7 @@ tas(volatile slock_t *lock)
 	return (int) _res;
 }
 
-#endif	 /* sparc */
+#endif	 /* __sparc__ */
 
 
 #if defined(__mc68000__) && defined(__linux__)
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index ac56e2711a..f3b788dd93 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -11,7 +11,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-int.h,v 1.9 1999/05/25 22:43:49 momjian Exp $
+ * $Id: libpq-int.h,v 1.10 1999/07/13 20:00:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -278,7 +278,7 @@ extern int	pqWait(int forRead, int forWrite, PGconn *conn);
 
 /* supply an implementation of strerror() macro if system doesn't have it */
 #ifndef strerror
-#if defined(sun) && defined(sparc) && !defined(__SVR4)
+#if defined(sun) && defined(__sparc__) && !defined(__SVR4)
 extern char *sys_errlist[];
 
 #define strerror(A) (sys_errlist[(A)])