From 7e42f4814d4914cb2be1cbe042cce547109dd6ce Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 4 Nov 1996 04:00:56 +0000 Subject: [PATCH] Removed PORTNAME_. Use OS version only. --- src/Makefile.global | 4 +-- src/backend/utils/Gen_fmgrtab.sh | 12 ++++---- src/bin/monitor/monitor.c | 4 +-- src/bin/pg4_dump/common.c | 2 +- src/bin/pg_dump/common.c | 4 +-- src/bin/pg_dump/pg_dump.c | 4 +-- src/include/c.h | 8 +++--- src/include/storage/buf_internals.h | 26 ++++++++--------- src/include/storage/ipc.h | 44 ++++++++++++++--------------- src/include/utils/array.h | 8 +++--- src/include/utils/builtins.h | 6 ++-- src/include/utils/exc.h | 8 +++--- src/include/utils/memutils.h | 4 +-- src/include/utils/nabstime.h | 10 +++---- src/interfaces/libpq/Makefile | 4 +-- src/interfaces/libpq/fe-connect.c | 4 +-- src/interfaces/libpq/libpq-fe.h | 6 ++-- 17 files changed, 78 insertions(+), 80 deletions(-) diff --git a/src/Makefile.global b/src/Makefile.global index b4c5252258..bc5ee55aa8 100644 --- 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 index b860f5d574..7c708c3752 100644 --- 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 < $TABCFILE < $TABCFILE < #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 # define MAXINT INT_MAX # else diff --git a/src/bin/monitor/monitor.c b/src/bin/monitor/monitor.c index 7770b00ddc..b1f9554637 100644 --- 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 #endif -#if defined(PORTNAME_sparc_solaris) || defined(PORTNAME_i386_solaris) +#if defined(sparc_solaris) || defined(i386_solaris) #include /* for MAXHOSTNAMELEN on some */ #endif #include diff --git a/src/bin/pg4_dump/common.c b/src/bin/pg4_dump/common.c index 0bf6cca533..caa941b571 100644 --- a/src/bin/pg4_dump/common.c +++ b/src/bin/pg4_dump/common.c @@ -16,7 +16,7 @@ #include #include #include /* for MAXHOSTNAMELEN on most */ -#if defined(PORTNAME_sparc_solaris) || defined(PORTNAME_i386_solaris) +#if defined(sparc_solaris) || defined(i386_solaris) #include /* for MAXHOSTNAMELEN on some */ #endif diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c index 431f8343cc..ac03f9e2e1 100644 --- 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 #include #include /* for MAXHOSTNAMELEN on most */ -#ifdef PORTNAME_sparc_solaris +#ifdef sparc_solaris #include /* for MAXHOSTNAMELEN on some */ #endif diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 4910f921c8..d7b4704109 100644 --- 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 #include #include /* for MAXHOSTNAMELEN on most */ -#ifdef PORTNAME_sparc_solaris +#ifdef sparc_solaris #include /* for MAXHOSTNAMELEN on some */ #endif diff --git a/src/include/c.h b/src/include/c.h index 3433eaf793..f505f392a4 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 d4c5a3eca7..dce25885f3 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 bbe18a0fd5..4af4972e49 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 f8bd6fdfd7..8ab5b1370f 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 055aa45306..24491453be 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 cbe4b546d0..570b30aad9 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 be5ef43eac..35f1a76505 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 92b5b65ab4..168c6dce42 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; diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 8a88617b73..4a26091ea1 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.10 1996/11/03 07:14:29 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.11 1996/11/04 04:00:53 momjian Exp $ # #------------------------------------------------------------------------- @@ -71,8 +71,6 @@ c.h: ../include/c.h rm -f c.h echo "#undef PORTNAME" > c.h echo "#define PORTNAME $(PORTNAME)" >> c.h - echo "#undef PORTNAME_$(PORTNAME)" >> c.h - echo "#define PORTNAME_$(PORTNAME)" >> c.h cat ../include/c.h >> c.h .PHONY: beforeinstall-headers install-headers diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index d0e50cfe34..8e67399370 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.13 1996/11/03 07:14:31 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.14 1996/11/04 04:00:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ #include "fe-auth.h" #include "libpq-fe.h" -#if defined(PORTNAME_ultrix4) || defined(PORTNAME_next) +#if defined(ultrix4) || defined(next) /* ultrix is lame and doesn't have strdup in libc for some reason */ /* [TRH] So doesn't NEXTSTEP. But whaddaya expect for a non-ANSI standard function? (My, my. Touchy today, are we?) */ diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 598e2c8cd2..073b2cf52f 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fe.h,v 1.8 1996/10/10 08:20:11 bryanh Exp $ + * $Id: libpq-fe.h,v 1.9 1996/11/04 04:00:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -261,10 +261,10 @@ typedef void *TUPLE; #define palloc malloc #define pfree free -#if defined(PORTNAME_sparc) +#if defined(sparc) extern char *sys_errlist[]; #define strerror(A) (sys_errlist[(A)]) -#endif /* PORTNAME_sparc */ +#endif /* sparc */ #ifdef __cplusplus }; -- GitLab