From d876c2580352fad94a22e57792a12da9ec9b85dd Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Thu, 15 Jan 1998 20:54:52 +0000
Subject: [PATCH] Fix:
nodeAgg.c: WARN -> NOTICE for elog
parse_oper.c: was created after patch for fmgr_info, so function call wrong
scan.c: regenerated for i386_solaris using flex 2.5.4
gethostname.c: required prototype for gethostname() function
config.h.in: create prototype for isinfo() function
isinf.c: "fake" isinf() under i386_solaris using fpclass() call...
---
src/backend/executor/nodeAgg.c | 2 +-
src/backend/parser/parse_oper.c | 8 +++-----
src/backend/parser/scan.c | 4 ++--
src/backend/port/gethostname.c | 4 +++-
src/backend/port/isinf.c | 15 +++++++++++++++
src/include/config.h.in | 5 ++++-
6 files changed, 28 insertions(+), 10 deletions(-)
create mode 100644 src/backend/port/isinf.c
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index feda58bcd67..91c5e43b613 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -437,7 +437,7 @@ ExecAgg(Agg *node)
args[0] = (char *) value2[i];
}
else
- elog(WARN, "ExecAgg: no valid transition functions??");
+ elog(NOTICE, "ExecAgg: no valid transition functions??");
value1[i] = (Datum) fmgr_c(&aggfns->finalfn,
(FmgrValues *) args, &(nulls[i]));
}
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index ebd7d1cc718..66961ca79ac 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.5 1998/01/05 03:32:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.6 1998/01/15 20:54:28 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -401,11 +401,9 @@ unary_oper_get_candidates(char *op,
*candidates = NULL;
- fmgr_info(NameEqualRegProcedure, (func_ptr *) &opKey[0].sk_func,
- &opKey[0].sk_nargs);
+ fmgr_info(NameEqualRegProcedure, (func_ptr *) &opKey[0].sk_func);
opKey[0].sk_argument = NameGetDatum(op);
- fmgr_info(CharacterEqualRegProcedure, (func_ptr *) &opKey[1].sk_func,
- &opKey[1].sk_nargs);
+ fmgr_info(CharacterEqualRegProcedure, (func_ptr *) &opKey[1].sk_func);
opKey[1].sk_argument = CharGetDatum(rightleft);
/* currently, only "unknown" can be coerced */
diff --git a/src/backend/parser/scan.c b/src/backend/parser/scan.c
index 68817122dc0..002d0e7fc47 100644
--- a/src/backend/parser/scan.c
+++ b/src/backend/parser/scan.c
@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.7 1998/01/13 19:28:29 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.8 1998/01/15 20:54:30 scrappy Exp $
*/
#define FLEX_SCANNER
@@ -539,7 +539,7 @@ char *yytext;
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.7 1998/01/13 19:28:29 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/Attic/scan.c,v 1.8 1998/01/15 20:54:30 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/port/gethostname.c b/src/backend/port/gethostname.c
index 780e1c6a6f5..66449d8524b 100644
--- a/src/backend/port/gethostname.c
+++ b/src/backend/port/gethostname.c
@@ -1,10 +1,12 @@
-/* $Id: gethostname.c,v 1.2 1997/12/19 13:34:26 scrappy Exp $ */
+/* $Id: gethostname.c,v 1.3 1998/01/15 20:54:34 scrappy Exp $ */
#include <sys/types.h>
#include <string.h>
#include <sys/utsname.h>
+#include "config.h"
+
int
gethostname(char *name, int namelen)
{
diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c
new file mode 100644
index 00000000000..ca5d22bfe5e
--- /dev/null
+++ b/src/backend/port/isinf.c
@@ -0,0 +1,15 @@
+/* $Id: isinf.c,v 1.1 1998/01/15 20:54:37 scrappy Exp $ */
+
+#include <ieeefp.h>
+#include <math.h>
+
+#include "config.h"
+
+
+int
+isinf(double x)
+{
+ if((fpclass(x) == FP_PINF) || (fpclass(x) == FP_NINF)) return 1;
+ else return 0;
+}
+
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 00db98f1abc..1e99ac39547 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -52,6 +52,9 @@
/* Set to 1 if you have isinf() */
#undef HAVE_ISINF
+#ifndef HAVE_ISINF
+int isinf(double x);
+#endif
/* Set to 1 if you have tzset() */
#undef HAVE_TZSET
@@ -59,7 +62,7 @@
/* Set to 1 if you have gethostname() */
#undef HAVE_GETHOSTNAME
#ifndef HAVE_GETHOSTNAME
-extern int gethostname(char *name, int namelen);
+int gethostname(char *name, int namelen);
#endif
/* Set to 1 if you have int timezone */
--
GitLab