From df6a9e633c6588c9665faa2d5cc9bcef682fdf30 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Thu, 31 Oct 1996 10:23:28 +0000
Subject: [PATCH] more removal of PORTNAME_*
---
src/backend/tcop/postgres.c | 16 ++++++++--------
src/backend/utils/adt/float.c | 22 +++++++++++-----------
src/backend/utils/adt/misc.c | 14 +++++++-------
src/backend/utils/adt/numutils.c | 10 +++++-----
src/backend/utils/error/elog.c | 8 ++++----
src/backend/utils/error/exc.c | 8 ++++----
6 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index b6eef30865b..3d5b61e7764 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.11 1996/10/30 21:18:22 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.12 1996/10/31 10:20:56 scrappy Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -16,11 +16,11 @@
*-------------------------------------------------------------------------
*/
#include "libpq/pqsignal.h" /* substitute for <signal.h> */
-#if defined(PORTNAME_linux)
+#if defined(linux)
#ifndef __USE_POSIX
#define __USE_POSIX
#endif
-#endif /* defined(PORTNAME_linux) */
+#endif /* defined(linux) */
#include <setjmp.h>
#include <stdio.h>
#include <string.h>
@@ -31,9 +31,9 @@
#include <netdb.h> /* for MAXHOSTNAMELEN on some */
#endif
#include <errno.h>
-#ifdef PORTNAME_aix
+#ifdef aix
#include <sys/select.h>
-#endif /* PORTNAME_aix */
+#endif /* aix */
#include "postgres.h"
@@ -104,13 +104,13 @@ static bool IsEmptyQuery = false;
Relation reldesc; /* current relation descritor */
char relname[80]; /* current relation name */
-#if defined(WIN32) || defined(PORTNAME_next)
+#if defined(WIN32) || defined(next)
jmp_buf Warn_restart;
#define sigsetjmp(x,y) setjmp(x)
#define siglongjmp longjmp
#else
sigjmp_buf Warn_restart;
-#endif /*defined(WIN32) || defined(PORTNAME_next) */
+#endif /*defined(WIN32) || defined(next) */
int InWarn;
extern int NBuffers;
@@ -1265,7 +1265,7 @@ PostgresMain(int argc, char *argv[])
*/
if (IsUnderPostmaster == false) {
puts("\nPOSTGRES backend interactive interface");
- puts("$Revision: 1.11 $ $Date: 1996/10/30 21:18:22 $");
+ puts("$Revision: 1.12 $ $Date: 1996/10/31 10:20:56 $");
}
/* ----------------
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 1ff33460926..6affe0691e6 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.5 1996/10/26 05:03:24 bryanh Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.6 1996/10/31 10:23:17 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1229,7 +1229,7 @@ double x;
#ifdef NEED_ISINF
-#if defined(PORTNAME_aix)
+#if defined(aix)
#ifdef CLASS_CONFLICT
/* we want the math symbol */
#undef class
@@ -1245,9 +1245,9 @@ static int isinf(x)
return(-1);
return(0);
}
-#endif /* PORTNAME_aix */
+#endif /* aix */
-#if defined(PORTNAME_ultrix4)
+#if defined(ultrix4)
#include <fp_class.h>
static int isinf(x)
double x;
@@ -1259,9 +1259,9 @@ static int isinf(x)
return(-1);
return(0);
}
-#endif /* PORTNAME_ultrix4 */
+#endif /* ultrix4 */
-#if defined(PORTNAME_alpha)
+#if defined(alpha)
#include <fp_class.h>
static int isinf(x)
double x;
@@ -1273,9 +1273,9 @@ static int isinf(x)
return(-1);
return(0);
}
-#endif /* PORTNAME_alpha */
+#endif /* alpha */
-#if defined(sparc_solaris) || defined(i386_solaris) || defined(PORTNAME_svr4)
+#if defined(sparc_solaris) || defined(i386_solaris) || defined(svr4)
#include <ieeefp.h>
static int
isinf(d)
@@ -1294,9 +1294,9 @@ double d;
return (0);
}
-#endif /* PORTNAME_sparc_solaris */
+#endif /* sparc_solaris */
-#if defined(PORTNAME_irix5)
+#if defined(irix5)
#include <ieeefp.h>
static int
isinf(d)
@@ -1315,6 +1315,6 @@ double d;
return (0);
}
-#endif /* PORTNAME_irix5 */
+#endif /* irix5 */
#endif /* NEED_ISINF */
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 97c80fb4f4b..2315fb34517 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.3 1996/07/22 21:56:02 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.4 1996/10/31 10:23:18 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,12 +17,12 @@
#include "catalog/pg_type.h"
#include "utils/builtins.h"
-#if !defined(PORTNAME_aix) && \
- !defined(PORTNAME_BSD44_derived) && \
- !defined(PORTNAME_bsdi) && \
- !defined(PORTNAME_bsdi_2_1) && \
- !defined(PORTNAME_irix5) && \
- !defined(PORTNAME_linux)
+#if !defined(aix) && \
+ !defined(BSD44_derived) && \
+ !defined(bsdi) && \
+ !defined(bsdi_2_1) && \
+ !defined(irix5) && \
+ !defined(linux)
extern int random();
extern int srandom(unsigned);
#endif
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 823212afa0f..b331d45426f 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.3 1996/07/22 21:56:03 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.4 1996/10/31 10:23:19 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -132,9 +132,9 @@ ltoa(int32 l, char *a)
int
ftoa(double value, char *ascii, int width, int prec1, char format)
{
-#if defined(PORTNAME_BSD44_derived) || \
- defined(PORTNAME_bsdi) || \
- defined(PORTNAME_bsdi_2_1)
+#if defined(BSD44_derived) || \
+ defined(bsdi) || \
+ defined(bsdi_2_1)
char out[256];
char fmt[256];
int ret;
@@ -281,7 +281,7 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
*a = 0;
avail = a - ascii;
return (avail);
-#endif /* !PORTNAME_BSD44_derived */
+#endif /* !BSD44_derived */
}
/*
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index f9400c4b92a..f8a08998545 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.6 1996/10/13 18:39:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.7 1996/10/31 10:23:26 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,9 +49,9 @@ elog(int lev, const char *fmt, ... )
register char *bp;
register const char *cp;
extern int errno, sys_nerr;
-#if !defined(PORTNAME_BSD44_derived) && \
- !defined(PORTNAME_bsdi) && \
- !defined(PORTNAME_bsdi_2_1)
+#if !defined(BSD44_derived) && \
+ !defined(bsdi) && \
+ !defined(bsdi_2_1)
extern char *sys_errlist[];
#endif /* bsd derived */
#ifndef PG_STANDALONE
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 532e3cb9964..61714bf970c 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.3 1996/07/22 21:58:28 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.4 1996/10/31 10:23:28 scrappy Exp $
*
* NOTE
* XXX this code needs improvement--check for state violations and
@@ -90,9 +90,9 @@ ExcPrint(Exception *excP,
{
extern int errno;
extern int sys_nerr;
-#if !defined(PORTNAME_BSD44_derived) && \
- !defined(PORTNAME_bsdi) && \
- !defined(PORTNAME_bsdi_2_1)
+#if !defined(BSD44_derived) && \
+ !defined(bsdi) && \
+ !defined(bsdi_2_1)
extern char *sys_errlist[];
#endif /* ! bsd_derived */
--
GitLab