Removed PORTNAME_. Use OS version only.

bmomjian · bmomjian · commit 7e42f4814d49 · 1996-11-04T04:00:56.000Z
diff --git a/src/Makefile.global b/src/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.51 1996/11/03 06:54:10 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.52 1996/11/04 03:59:09 momjian Exp $
 #
 # NOTES
 #    This is seen by any Makefiles that include mk/postgres.mk. To
@@ -888,7 +888,7 @@ ifdef PROFILE
 endif
 
 # Globally pass PORTNAME
-CFLAGS+= -DPORTNAME_$(PORTNAME) -D$(PORTNAME)
+CFLAGS+= -D$(PORTNAME)
 
 # include port-specific flags
 CFLAGS+= $(CFLAGS_BE)
diff --git a/src/backend/utils/Gen_fmgrtab.sh b/src/backend/utils/Gen_fmgrtab.sh
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.4 1996/10/31 07:37:57 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.5 1996/11/04 03:59:18 momjian Exp $
 #
 # NOTES
 #    Passes any -D options on to cpp prior to generating the list
@@ -81,7 +81,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: Gen_fmgrtab.sh,v 1.4 1996/10/31 07:37:57 scrappy Exp $
+ * $Id: Gen_fmgrtab.sh,v 1.5 1996/11/04 03:59:18 momjian Exp $
  *
  * NOTES
  *	******************************
@@ -173,7 +173,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.4 1996/10/31 07:37:57 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.5 1996/11/04 03:59:18 momjian Exp $
  *
  * NOTES
  *
@@ -193,9 +193,9 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
 #ifdef WIN32
 #include <limits.h>
 #else
-# if defined(PORTNAME_BSD44_derived) || \
-     defined(PORTNAME_bsdi) || \
-     defined(PORTNAME_bsdi_2_1)
+# if defined(BSD44_derived) || \
+     defined(bsdi) || \
+     defined(bsdi_2_1)
 # include <machine/limits.h>
 # define MAXINT	INT_MAX
 # else
diff --git a/src/bin/monitor/monitor.c b/src/bin/monitor/monitor.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/monitor/Attic/monitor.c,v 1.5 1996/07/23 03:03:24 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/monitor/Attic/monitor.c,v 1.6 1996/11/04 03:59:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
 #ifndef WIN32
 #include <unistd.h>
 #endif
-#if defined(PORTNAME_sparc_solaris) || defined(PORTNAME_i386_solaris)
+#if defined(sparc_solaris) || defined(i386_solaris)
 #include <netdb.h>	/* for MAXHOSTNAMELEN on some */
 #endif
 #include <sys/types.h>
diff --git a/src/bin/pg4_dump/common.c b/src/bin/pg4_dump/common.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/param.h>	/* for MAXHOSTNAMELEN on most */
-#if defined(PORTNAME_sparc_solaris) || defined(PORTNAME_i386_solaris)
+#if defined(sparc_solaris) || defined(i386_solaris)
 #include <netdb.h>	/* for MAXHOSTNAMELEN on some */
 #endif
 
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.6 1996/10/07 03:30:31 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.7 1996/11/04 03:59:53 momjian Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/param.h>	/* for MAXHOSTNAMELEN on most */
-#ifdef PORTNAME_sparc_solaris
+#ifdef sparc_solaris
 #include <netdb.h>	/* for MAXHOSTNAMELEN on some */
 #endif
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -20,7 +20,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.11 1996/10/07 21:17:01 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.12 1996/11/04 04:00:02 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -46,7 +46,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/param.h>	/* for MAXHOSTNAMELEN on most */
-#ifdef PORTNAME_sparc_solaris
+#ifdef sparc_solaris
 #include <netdb.h>	/* for MAXHOSTNAMELEN on some */
 #endif
 
diff --git 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
@@ -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
@@ -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,51 +31,51 @@
  *     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.
  */
 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.
  */
 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.51 1996/11/03 06:54:10 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.52 1996/11/04 03:59:09 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`# NOTES`
`13`	`13`	`# This is seen by any Makefiles that include mk/postgres.mk. To`
`@@ -888,7 +888,7 @@ ifdef PROFILE`
`888`	`888`	`endif`
`889`	`889`
`890`	`890`	`# Globally pass PORTNAME`
`891`		`-CFLAGS+= -DPORTNAME_$(PORTNAME) -D$(PORTNAME)`
	`891`	`+CFLAGS+= -D$(PORTNAME)`
`892`	`892`
`893`	`893`	`# include port-specific flags`
`894`	`894`	`CFLAGS+= $(CFLAGS_BE)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`#`
`10`	`10`	`# IDENTIFICATION`
`11`		`-# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.4 1996/10/31 07:37:57 scrappy Exp $`
	`11`	`+# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.5 1996/11/04 03:59:18 momjian Exp $`
`12`	`12`	`#`
`13`	`13`	`# NOTES`
`14`	`14`	`# Passes any -D options on to cpp prior to generating the list`
`@@ -81,7 +81,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf`
`81`	`81`	`*`
`82`	`82`	`* Copyright (c) 1994, Regents of the University of California`
`83`	`83`	`*`
`84`		`- * $Id: Gen_fmgrtab.sh,v 1.4 1996/10/31 07:37:57 scrappy Exp $`
	`84`	`+ * $Id: Gen_fmgrtab.sh,v 1.5 1996/11/04 03:59:18 momjian Exp $`
`85`	`85`	`*`
`86`	`86`	`* NOTES`
`87`	`87`	`* ******************************`
`@@ -173,7 +173,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF`
`173`	`173`	`*`
`174`	`174`	`*`
`175`	`175`	`* IDENTIFICATION`
`176`		`- * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.4 1996/10/31 07:37:57 scrappy Exp $`
	`176`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.5 1996/11/04 03:59:18 momjian Exp $`
`177`	`177`	`*`
`178`	`178`	`* NOTES`
`179`	`179`	`*`
`@@ -193,9 +193,9 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF`
`193`	`193`	`#ifdef WIN32`
`194`	`194`	`#include <limits.h>`
`195`	`195`	`#else`
`196`		`-# if defined(PORTNAME_BSD44_derived) \|\| \`
`197`		`- defined(PORTNAME_bsdi) \|\| \`
`198`		`- defined(PORTNAME_bsdi_2_1)`
	`196`	`+# if defined(BSD44_derived) \|\| \`
	`197`	`+ defined(bsdi) \|\| \`
	`198`	`+ defined(bsdi_2_1)`
`199`	`199`	`# include <machine/limits.h>`
`200`	`200`	`# define MAXINT INT_MAX`
`201`	`201`	`# else`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*`
`21`	`21`	`*`
`22`	`22`	`* IDENTIFICATION`
`23`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.11 1996/10/07 21:17:01 scrappy Exp $`
	`23`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.12 1996/11/04 04:00:02 momjian Exp $`
`24`	`24`	`*`
`25`	`25`	`* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb`
`26`	`26`	`*`
`@@ -46,7 +46,7 @@`
`46`	`46`	`#include <stdio.h>`
`47`	`47`	`#include <string.h>`
`48`	`48`	`#include <sys/param.h> /* for MAXHOSTNAMELEN on most */`
`49`		`-#ifdef PORTNAME_sparc_solaris`
	`49`	`+#ifdef sparc_solaris`
`50`	`50`	`#include <netdb.h> /* for MAXHOSTNAMELEN on some */`
`51`	`51`	`#endif`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: builtins.h,v 1.3 1996/11/03 12:13:34 scrappy Exp $`
	`9`	`+ * $Id: builtins.h,v 1.4 1996/11/04 04:00:43 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`* NOTES`
`12`	`12`	`* This should normally only be included by fmgr.h.`
`@@ -170,9 +170,9 @@ extern uint32 NameComputeLength(Name name);`
`170`	`170`
`171`	`171`	`/* numutils.c */`
`172`	`172`	`/* XXX hack. HP-UX has a ltoa (with different arguments) already. */`
`173`		`-#ifdef PORTNAME_hpux`
	`173`	`+#ifdef hpux`
`174`	`174`	`#define ltoa pg_ltoa`
`175`		`-#endif /* PORTNAME_hpux */`
	`175`	`+#endif /* hpux */`
`176`	`176`	`extern int32 pg_atoi(char *s, int size, int c);`
`177`	`177`	`extern void itoa(int i, char *a);`
`178`	`178`	`extern void ltoa(int32 l, char *a);`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`* Copyright (c) 1994, Regents of the University of California`
`17`	`17`	`*`
`18`		`- * $Id: memutils.h,v 1.3 1996/11/03 12:13:35 scrappy Exp $`
	`18`	`+ * $Id: memutils.h,v 1.4 1996/11/04 04:00:48 momjian Exp $`
`19`	`19`	`*`
`20`	`20`	`* NOTES`
`21`	`21`	`* some of the information in this file will be moved to`
`@@ -67,7 +67,7 @@ s...)`
`67`	`67`	`*/`
`68`	`68`	`#if defined(sun) && ! defined(sparc)`
`69`	`69`	`#define LONGALIGN(LEN) SHORTALIGN(LEN)`
`70`		`-#elif defined (PORTNAME_alpha)`
	`70`	`+#elif defined (alpha)`
`71`	`71`	`#define LONGALIGN(LEN)\`
`72`	`72`	`(((long)(LEN) + (sizeof (int) - 1)) & ~(sizeof (int) -1))`
`73`	`73`	`#else`