summaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
authorMarc G. Fournier <scrappy@hub.org>1996-07-16 07:13:58 +0000
committerMarc G. Fournier <scrappy@hub.org>1996-07-16 07:13:58 +0000
commit55aab6a43453efbc5e10e8381343d474c2d70298 (patch)
tree1c7230c98f364c4655e19f3b08c9d2827141bc2b /src/backend/utils
parentbf2abf0dae2cebae5c66dcc3d68687d61aa5b4a3 (diff)
fix: BSDi 2.1 requires a port seperate from BSDi 2.0{.1}
submitted by: Bruce Momjian (root@candle.pha.pa.us)
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/Gen_fmgrtab.sh10
-rw-r--r--src/backend/utils/adt/misc.c4
-rw-r--r--src/backend/utils/adt/numutils.c4
-rw-r--r--src/backend/utils/error/elog.c4
-rw-r--r--src/backend/utils/error/exc.c4
5 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/utils/Gen_fmgrtab.sh b/src/backend/utils/Gen_fmgrtab.sh
index f6af3aa80d4..ed5ed2feeed 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.1.1.1 1996/07/09 06:22:00 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.2 1996/07/16 07:13:25 scrappy 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.1.1.1 1996/07/09 06:22:00 scrappy Exp $
+ * $Id: Gen_fmgrtab.sh,v 1.2 1996/07/16 07:13:25 scrappy Exp $
*
* NOTES
* ******************************
@@ -175,7 +175,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.1.1.1 1996/07/09 06:22:00 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.2 1996/07/16 07:13:25 scrappy Exp $
*
* NOTES
*
@@ -195,12 +195,12 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
#ifdef WIN32
#include <limits.h>
#else
-# if defined(PORTNAME_BSD44_derived) || defined(PORTNAME_bsdi)
+# if defined(PORTNAME_BSD44_derived) || defined(PORTNAME_bsdi) || defined(PORTNAME_bsdi_2_1)
# include <machine/limits.h>
# define MAXINT INT_MAX
# else
# include <values.h> /* for MAXINT */
-# endif /* PORTNAME_BSD44_derived || PORTNAME_bsdi */
+# endif /* PORTNAME_BSD44_derived || PORTNAME_bsdi || PORTNAME_bsdi_2_1 */
#endif /* WIN32 */
#include "utils/fmgrtab.h"
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 7ba7cc98f7e..094973257ac 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.1.1.1 1996/07/09 06:22:04 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.2 1996/07/16 07:13:33 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@
#include "utils/builtins.h"
#if !defined(PORTNAME_linux) && !defined(PORTNAME_BSD44_derived) && \
- !defined(PORTNAME_irix5) && !defined(PORTNAME_bsdi) && !defined(PORTNAME_aix)
+ !defined(PORTNAME_irix5) && !defined(PORTNAME_bsdi) && !defined(PORTNAME_bsdi_2_1) && !defined(PORTNAME_aix)
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 d5e07b5f268..93221051f24 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.1.1.1 1996/07/09 06:22:05 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.2 1996/07/16 07:13:35 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -132,7 +132,7 @@ 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)
+#if defined(PORTNAME_BSD44_derived) || defined(PORTNAME_bsdi) || defined(PORTNAME_bsdi_2_1)
char out[256];
char fmt[256];
int ret;
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index d5bef1ab1ba..bf7d15e5582 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.1.1.1 1996/07/09 06:22:07 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.2 1996/07/16 07:13:47 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,7 +48,7 @@ elog(int lev, char *fmt, ... )
char buf[ELOG_MAXLEN], line[ELOG_MAXLEN];
register char *bp, *cp;
extern int errno, sys_nerr;
-#if !defined(PORTNAME_BSD44_derived) && !defined(PORTNAME_bsdi)
+#if !defined(PORTNAME_BSD44_derived) && !defined(PORTNAME_bsdi) && !defined(PORTNAME_bsdi_2_1)
extern char *sys_errlist[];
#endif /* !PORTNAME_BSD44_derived */
#ifndef PG_STANDALONE
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 35c5db9118f..3e1b8f98b41 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.1.1.1 1996/07/09 06:22:07 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.2 1996/07/16 07:13:49 scrappy Exp $
*
* NOTE
* XXX this code needs improvement--check for state violations and
@@ -90,7 +90,7 @@ ExcPrint(Exception *excP,
{
extern int errno;
extern int sys_nerr;
-#if !defined(PORTNAME_BSD44_derived) && !defined(PORTNAME_bsdi)
+#if !defined(PORTNAME_BSD44_derived) && !defined(PORTNAME_bsdi) && !defined(PORTNAME_bsdi_2_1)
extern char *sys_errlist[];
#endif /* !PORTNAME_BSD44_derived */