Commitd8ae7ff

committed

Fix for no platform NAN.

1 parentda361ee commitd8ae7ffCopy full SHA for d8ae7ff

File tree

+13

-7

lines changed

+13

-7

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`
`18`	`18`	`#if defined(LIBC_SCCS)&& !defined(lint)`
`19`		`-staticconstcharrcsid[]="$Id: inet_net_ntop.c,v 1.3 1998/10/22 13:16:25 momjian Exp $";`
	`19`	`+staticconstcharrcsid[]="$Id: inet_net_ntop.c,v 1.4 1999/01/01 04:17:13 momjian Exp $";`
`20`	`20`
`21`	`21`	`#endif`
`22`	`22`
`@@ -189,7 +189,6 @@ inet_net_ntop_ipv4(const u_char src, int bits, char dst, size_t size)`
`189`	`189`	`char*odst=dst;`
`190`	`190`	`char*t;`
`191`	`191`	`size_tlen=4;`
`192`		`-u_intm;`
`193`	`192`	`intb,tb;`
`194`	`193`
`195`	`194`	`if (bits<0\|\|bits>32)`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*is for IP V4 CIDR notation, but prepared for V6: just`
`4`	`4`	`*add the necessary bits where the comments indicate.`
`5`	`5`	`*`
`6`		`- *$Id: network.c,v 1.4 1998/10/29 16:13:07 tgl Exp $`
	`6`	`+ *$Id: network.c,v 1.5 1999/01/01 04:17:13 momjian Exp $`
`7`	`7`	`*Jon Postel RIP 16 Oct 1998`
`8`	`8`	`*/`
`9`	`9`
`@@ -389,8 +389,7 @@ network_network(inet *ip)`
`389`	`389`	`{`
`390`	`390`	`text*ret;`
`391`	`391`	`intlen;`
`392`		`-char*ptr,`
`393`		`-tmp[sizeof("255.255.255.255/32")];`
	`392`	`+chartmp[sizeof("255.255.255.255/32")];`
`394`	`393`
`395`	`394`	`if (ip_family(ip)==AF_INET)`
`396`	`395`	`{`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`*1998 Jan Wieck`
`7`	`7`	`*`
`8`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.2 1998/12/30 20:46:05 wieck Exp $`
	`8`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.3 1999/01/01 04:17:13 momjian Exp $`
`9`	`9`	`*`
`10`	`10`	`* ----------`
`11`	`11`	`*/`
`@@ -16,7 +16,7 @@`
`16`	`16`	`#include<ctype.h>`
`17`	`17`	`#include<float.h>`
`18`	`18`	`#include<math.h>`
`19`		`-#include<nan.h>`
	`19`	`+/#include <nan.h> BSD/OS does not have this /`
`20`	`20`	`#include<errno.h>`
`21`	`21`	`#include<sys/types.h>`
`22`	`22`
`@@ -1723,7 +1723,11 @@ numeric_float8(Numeric num)`
`1723`	`1723`	`if (NUMERIC_IS_NAN(num))`
`1724`	`1724`	`{`
`1725`	`1725`	`result= (float64)palloc(sizeof(float64data));`
	`1726`	`+#ifdefNAN`
`1726`	`1727`	`*result=NAN;`
	`1728`	`+#else`
	`1729`	`+*result=num;`
	`1730`	`+#endif`
`1727`	`1731`	`returnresult;`
`1728`	`1732`	`}`
`1729`	`1733`
`@@ -1773,7 +1777,11 @@ numeric_float4(Numeric num)`
`1773`	`1777`	`if (NUMERIC_IS_NAN(num))`
`1774`	`1778`	`{`
`1775`	`1779`	`result= (float32)palloc(sizeof(float32data));`
	`1780`	`+#ifdefNAN`
`1776`	`1781`	`*result=NAN;`
	`1782`	`+#else`
	`1783`	`+*result=num;`
	`1784`	`+#endif`
`1777`	`1785`	`returnresult;`
`1778`	`1786`	`}`
`1779`	`1787`

Comments

(0)