diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-01-01 04:17:13 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-01-01 04:17:13 +0000 |
| commit | d8ae7ffb2f81587d513951e5244f5cd97db508e8 (patch) | |
| tree | 036d74f7f16d2aed2ce8025df7687e7aa0155c75 /src | |
| parent | da361ee24b6b64923fb646363031b21d28d8b028 (diff) | |
| download | postgresql-d8ae7ffb2f81587d513951e5244f5cd97db508e8.tar.gz postgresql-d8ae7ffb2f81587d513951e5244f5cd97db508e8.zip | |
Fix for no platform NAN.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/inet_net_ntop.c | 3 | ||||
| -rw-r--r-- | src/backend/utils/adt/network.c | 5 | ||||
| -rw-r--r-- | src/backend/utils/adt/numeric.c | 12 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src/backend/utils/adt/inet_net_ntop.c b/src/backend/utils/adt/inet_net_ntop.c index 87f14dec944..d8cd2ff4497 100644 --- a/src/backend/utils/adt/inet_net_ntop.c +++ b/src/backend/utils/adt/inet_net_ntop.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.3 1998/10/22 13:16:25 momjian Exp $"; +static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.4 1999/01/01 04:17:13 momjian Exp $"; #endif @@ -189,7 +189,6 @@ inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size) char *odst = dst; char *t; size_t len = 4; - u_int m; int b, tb; if (bits < 0 || bits > 32) diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c index 01885e8c959..bb2d9070e6a 100644 --- a/src/backend/utils/adt/network.c +++ b/src/backend/utils/adt/network.c @@ -3,7 +3,7 @@ * is for IP V4 CIDR notation, but prepared for V6: just * add the necessary bits where the comments indicate. * - * $Id: network.c,v 1.4 1998/10/29 16:13:07 tgl Exp $ + * $Id: network.c,v 1.5 1999/01/01 04:17:13 momjian Exp $ * Jon Postel RIP 16 Oct 1998 */ @@ -389,8 +389,7 @@ network_network(inet *ip) { text *ret; int len; - char *ptr, - tmp[sizeof("255.255.255.255/32")]; + char tmp[sizeof("255.255.255.255/32")]; if (ip_family(ip) == AF_INET) { diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 6ee7f6ba2c2..900d62d2d48 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.2 1998/12/30 20:46:05 wieck Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.3 1999/01/01 04:17:13 momjian Exp $ * * ---------- */ @@ -16,7 +16,7 @@ #include <ctype.h> #include <float.h> #include <math.h> -#include <nan.h> +/*#include <nan.h> BSD/OS does not have this */ #include <errno.h> #include <sys/types.h> @@ -1723,7 +1723,11 @@ numeric_float8(Numeric num) if (NUMERIC_IS_NAN(num)) { result = (float64)palloc(sizeof(float64data)); +#ifdef NAN *result = NAN; +#else + *result = num; +#endif return result; } @@ -1773,7 +1777,11 @@ numeric_float4(Numeric num) if (NUMERIC_IS_NAN(num)) { result = (float32)palloc(sizeof(float32data)); +#ifdef NAN *result = NAN; +#else + *result = num; +#endif return result; } |