Removed PORTNAME_. Use OS version only.

8 files changed, 57 insertions, 57 deletions

diff --git a/src/include/c.h b/src/include/c.h
index 3433eaf793f..f505f392a4b 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.1 1996/10/31 07:10:12 scrappy Exp $
+ * $Id: c.h,v 1.2 1996/11/04 04:00:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -737,11 +737,11 @@ extern char *form(char *fmt, ...);
  * ----------------------------------------------------------------
  */
 
-#if defined(PORTNAME_hpux) 
+#if defined(hpux) 
 #include "port/hpux/fixade.h"		/* for 8.07 unaligned access fixup */
-#endif /* PORTNAME_hpux */
+#endif /* hpux */
 
-#if defined(PORTNAME_sparc)
+#if defined(sparc)
 #define	memmove(d, s, l)	bcopy(s, d, l)
 #endif
 
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index d4c5a3eca7f..dce25885f3d 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: buf_internals.h,v 1.3 1996/11/01 03:36:13 momjian Exp $
+ * $Id: buf_internals.h,v 1.4 1996/11/04 04:00:24 momjian Exp $
  *
  * NOTE
  *	If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -137,36 +137,36 @@ struct sbufdesc {
 
 /* NO spinlock */
 
-#if defined(PORTNAME_ultrix4)
+#if defined(ultrix4)
     char		sb_pad[60];	/* no slock_t */
 #endif /* mips */
 
 /* HAS_TEST_AND_SET -- platform dependent size */
 
-#if defined(PORTNAME_aix)
+#if defined(aix)
     char		sb_pad[44];	/* typedef unsigned int slock_t; */
 #endif /* aix */
-#if defined(PORTNAME_alpha)
+#if defined(alpha)
     char		sb_pad[40];	/* typedef msemaphore slock_t; */
 #endif /* alpha */
-#if defined(PORTNAME_hpux)
+#if defined(hpux)
     char		sb_pad[44];	/* typedef struct { int sem[4]; } slock_t; */
 #endif /* hpux */
-#if defined(PORTNAME_irix5)
+#if defined(irix5)
     char		sb_pad[44];	/* typedef abilock_t slock_t; */
 #endif /* irix5 */
-#if defined(PORTNAME_next)
+#if defined(next)
     char		sb_pad[56];	/* typedef struct mutex slock_t; */
 #endif /* next */
 
 /* HAS_TEST_AND_SET -- default 1 byte spinlock */
 
-#if defined(PORTNAME_BSD44_derived) || \
-    defined(PORTNAME_bsdi) || \
-    defined(PORTNAME_i386_solaris) || \
-    defined(PORTNAME_linux) || \
-    defined(PORTNAME_sparc) || \
-    defined(PORTNAME_sparc_solaris)
+#if defined(BSD44_derived) || \
+    defined(bsdi) || \
+    defined(i386_solaris) || \
+    defined(linux) || \
+    defined(sparc) || \
+    defined(sparc_solaris)
     char		sb_pad[56];	/* has slock_t */
 #endif /* 1 byte slock_t */
 };
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index bbe18a0fd59..4af4972e498 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ipc.h,v 1.8 1996/11/01 09:31:12 scrappy Exp $
+ * $Id: ipc.h,v 1.9 1996/11/04 04:00:28 momjian Exp $
  *
  * NOTES
  *    This file is very architecture-specific.  This stuff should actually
@@ -31,27 +31,27 @@
  *     we may in fact have different architectures, thus make the tests
  *     based on portnames somewhat misleading.
  */
-#if defined(PORTNAME_aix) || \
-    defined(PORTNAME_alpha) || \
-    defined(PORTNAME_BSD44_derived) || \
-    defined(PORTNAME_bsdi) || \
-    defined(PORTNAME_hpux) || \
-    defined(PORTNAME_i386_solaris) || \
-    defined(PORTNAME_irix5) || \
-    defined(PORTNAME_linux) || \
-    defined(PORTNAME_next) || \
-    defined(PORTNAME_sparc) || \
-    defined(PORTNAME_sparc_solaris)
+#if defined(aix) || \
+    defined(alpha) || \
+    defined(BSD44_derived) || \
+    defined(bsdi) || \
+    defined(hpux) || \
+    defined(i386_solaris) || \
+    defined(irix5) || \
+    defined(linux) || \
+    defined(next) || \
+    defined(sparc) || \
+    defined(sparc_solaris)
 #define HAS_TEST_AND_SET
 #endif
 
-#if defined(PORTNAME_BSD44_derived) && defined(__mips__)
+#if defined(BSD44_derived) && defined(__mips__)
 #undef HAS_TEST_AND_SET
 #endif
 
 #if defined(HAS_TEST_AND_SET)
 
-#if defined(PORTNAME_aix)
+#if defined(aix)
 /*
  * The AIX C library has the cs(3) builtin for compare-and-set that 
  * operates on ints.
@@ -59,11 +59,11 @@
 typedef unsigned int	slock_t;
 #else /* aix */
 
-#if defined(PORTNAME_alpha)
+#if defined(alpha)
 typedef msemaphore	slock_t;
 #else /* alpha */
 
-#if defined(PORTNAME_hpux)
+#if defined(hpux)
 /*
  * The PA-RISC "semaphore" for the LDWCX instruction is 4 bytes aligned
  * to a 16-byte boundary.
@@ -71,11 +71,11 @@ typedef msemaphore	slock_t;
 typedef struct { int sem[4]; } slock_t;
 #else /* hpux */
 
-#if defined(PORTNAME_irix5)
+#if defined(irix5)
 typedef abilock_t	slock_t;
 #else /* irix5 */
 
-#if defined(PORTNAME_next)
+#if defined(next)
 /*
  * Use Mach mutex routines since these are, in effect, test-and-set
  * spinlocks.
@@ -99,10 +99,10 @@ extern void S_LOCK(slock_t *lock);
 extern void S_UNLOCK(slock_t *lock);
 extern void S_INIT_LOCK(slock_t *lock);
 
-#if defined(PORTNAME_alpha) || \
-    defined(PORTNAME_hpux) || \
-    defined(PORTNAME_irix5) || \
-    defined(PORTNAME_next)
+#if defined(alpha) || \
+    defined(hpux) || \
+    defined(irix5) || \
+    defined(next)
 extern int S_LOCK_FREE(slock_t *lock);
 #else
 #define S_LOCK_FREE(lock)	((*lock) == 0)
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index f8bd6fdfd78..8ab5b1370f8 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.1 1996/08/28 01:58:42 scrappy Exp $
+ * $Id: array.h,v 1.2 1996/11/04 04:00:36 momjian Exp $
  *
  * NOTES
  *    XXX the data array should be LONGALIGN'd -- notice that the array
@@ -97,11 +97,11 @@ typedef struct {
  *------------------------------------------------------------------------
  */
 
-/* #if defined(PORTNAME_irix5) */
+/* #if defined(irix5) */
 /* #define RETURN_NULL {*isNull = true; return(0); }*/
-/* #else*/ /* PORTNAME_irix5 */
+/* #else*/ /* irix5 */
 #define RETURN_NULL {*isNull = true; return(0); }
-/* #endif */ /* PORTNAME_irix5 */ 
+/* #endif */ /* irix5 */ 
 #define NAME_LEN    30
 #define MAX_BUFF_SIZE (1 << 13)
 
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 055aa453064..24491453be4 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.3 1996/11/03 12:13:34 scrappy Exp $
+ * $Id: builtins.h,v 1.4 1996/11/04 04:00:43 momjian Exp $
  *
  * NOTES
  *    This should normally only be included by fmgr.h.
@@ -170,9 +170,9 @@ extern uint32 NameComputeLength(Name name);
 
 /* numutils.c */
 /* XXX hack.  HP-UX has a ltoa (with different arguments) already. */
-#ifdef PORTNAME_hpux
+#ifdef hpux
 #define ltoa pg_ltoa
-#endif /* PORTNAME_hpux */
+#endif /* hpux */
 extern int32 pg_atoi(char *s, int size, int c);
 extern void itoa(int i, char *a);
 extern void ltoa(int32 l, char *a);
diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h
index cbe4b546d0f..570b30aad92 100644
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: exc.h,v 1.2 1996/10/31 09:51:13 scrappy Exp $
+ * $Id: exc.h,v 1.3 1996/11/04 04:00:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,9 +22,9 @@ extern Index ExcLineNumber;
  * ExcMessage and Exception are now defined in c.h
  */
 
-#if defined(PORTNAME_hpux) || \
-    defined(PORTNAME_linux) || \
-    defined(PORTNAME_next) || \
+#if defined(hpux) || \
+    defined(linux) || \
+    defined(next) || \
     defined(WIN32)
 typedef jmp_buf		ExcContext;
 #else
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index be5ef43eac5..35f1a765054 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.3 1996/11/03 12:13:35 scrappy Exp $
+ * $Id: memutils.h,v 1.4 1996/11/04 04:00:48 momjian Exp $
  *
  * NOTES
  *    some of the information in this file will be moved to
@@ -67,7 +67,7 @@ s...)
  */
 #if defined(sun) && ! defined(sparc)
 #define	LONGALIGN(LEN)	SHORTALIGN(LEN)
-#elif defined (PORTNAME_alpha)
+#elif defined (alpha)
 #define	LONGALIGN(LEN)\
 	(((long)(LEN) + (sizeof (int) - 1)) & ~(sizeof (int) -1))
 #else
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index 92b5b65ab4e..168c6dce423 100644
--- a/src/include/utils/nabstime.h
+++ b/src/include/utils/nabstime.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nabstime.h,v 1.2 1996/11/01 09:19:11 scrappy Exp $
+ * $Id: nabstime.h,v 1.3 1996/11/04 04:00:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,7 +36,7 @@ typedef TimeIntervalData *TimeInterval;
 #define NOEND_ABSTIME	((AbsoluteTime) 2147483645) /* 2^31 - 3 */
 
 
-#if defined(PORTNAME_aix)
+#if defined(aix)
 /*
  * AIX considers 2147483648 == -2147483648 (since they have the same bit
  * representation) but uses a different sign sense in a comparison to 
@@ -49,7 +49,7 @@ typedef TimeIntervalData *TimeInterval;
 #else
 /*#define NOSTART_ABSTIME ((AbsoluteTime) 2147483648)*/	/* - 2^31 */
 #define NOSTART_ABSTIME ((AbsoluteTime) -2147483647)	/* - 2^31 */
-#endif /* PORTNAME_aix */
+#endif /* aix */
 
 #define INVALID_RELTIME ((RelativeTime) 2147483647)	/* 2^31 - 1 */
 
@@ -126,11 +126,11 @@ typedef TimeIntervalData *TimeInterval;
 
 /* keep this struct small; it gets used a lot */
 typedef struct {
-#if defined(PORTNAME_aix)
+#if defined(aix)
     char *token;
 #else
     char token[TOKMAXLEN];
-#endif /* PORTNAME_aix */
+#endif /* aix */
     char type;
     char value;		/* this may be unsigned, alas */
 } datetkn;