Fix "abs(int) is ambiguous" and make sure _XOPEN_SOURCE and __EXTENSIONS__ are not both defined

----------------------------------------------------------------------

5 files changed, 72 insertions, 1 deletions

diff --git a/net/pchar/distinfo b/net/pchar/distinfo
index dba56958aa3..ec488aef3b6 100644
--- a/net/pchar/distinfo
+++ b/net/pchar/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.8 2013/03/03 01:06:49 joerg Exp $
+$NetBSD: distinfo,v 1.9 2014/02/24 12:49:56 wiedi Exp $
 
 SHA1 (pchar-1.5.tar.gz) = 3e78505b881773d2a726b426c6023ee2519bed75
 RMD160 (pchar-1.5.tar.gz) = b8e600b9c11cf7e584768c87aadeeb9d7b482949
 Size (pchar-1.5.tar.gz) = 117678
+SHA1 (patch-PctestIpv6Icmp.cc) = 28f4807aa8776fc45377661f4095b9033ad69d36
+SHA1 (patch-PctestIpv6Tcp.cc) = 06113c259529c51d756ae848bcea831c5dac5471
+SHA1 (patch-PctestIpv6Udp.cc) = c2d8dfac106ad7510b0005f6f078983833f909ce
+SHA1 (patch-ResultTable.cc) = ad3ce2c717d50f26c2dbea52fde648fe04e27c19
 SHA1 (patch-ab) = e298aec0ea18925f677da019bff8548fb5a2a96f
 SHA1 (patch-pc.h) = ca30eeef1f48b88dc9c36d22caa4f2edc29d093e
diff --git a/net/pchar/patches/patch-PctestIpv6Icmp.cc b/net/pchar/patches/patch-PctestIpv6Icmp.cc
new file mode 100644
index 00000000000..427fc64705c
--- /dev/null
+++ b/net/pchar/patches/patch-PctestIpv6Icmp.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-PctestIpv6Icmp.cc,v 1.1 2014/02/24 12:49:56 wiedi Exp $
+
+don't define _XOPEN_SOURCE and __EXTENSIONS__ at the same time
+--- PctestIpv6Icmp.cc.orig	2005-02-12 20:32:18.000000000 +0000
++++ PctestIpv6Icmp.cc
+@@ -22,7 +22,6 @@ static char rcsid[] = "$Id: PctestIpv6Ic
+ // according to Erik Nordmark <Erik.Nordmark@eng.sun.com>.  His quick
+ // fix to do this is:
+ #ifdef NEED_XOPEN
+-#define _XOPEN_SOURCE 500
+ #define __EXTENSIONS__
+ #endif /* NEED_XOPEN */
+ 
diff --git a/net/pchar/patches/patch-PctestIpv6Tcp.cc b/net/pchar/patches/patch-PctestIpv6Tcp.cc
new file mode 100644
index 00000000000..a82d327f052
--- /dev/null
+++ b/net/pchar/patches/patch-PctestIpv6Tcp.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-PctestIpv6Tcp.cc,v 1.1 2014/02/24 12:49:56 wiedi Exp $
+
+don't define _XOPEN_SOURCE and __EXTENSIONS__ at the same time
+--- PctestIpv6Tcp.cc.orig	2005-02-12 20:32:18.000000000 +0000
++++ PctestIpv6Tcp.cc
+@@ -22,7 +22,6 @@ static char rcsid[] = "$Id: PctestIpv6Tc
+ // according to Erik Nordmark <Erik.Nordmark@eng.sun.com>.  His quick
+ // fix to do this is:
+ #ifdef NEED_XOPEN
+-#define _XOPEN_SOURCE 500
+ #define __EXTENSIONS__
+ #endif /* NEED_XOPEN */
+ 
diff --git a/net/pchar/patches/patch-PctestIpv6Udp.cc b/net/pchar/patches/patch-PctestIpv6Udp.cc
new file mode 100644
index 00000000000..247fe2f4f5a
--- /dev/null
+++ b/net/pchar/patches/patch-PctestIpv6Udp.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-PctestIpv6Udp.cc,v 1.1 2014/02/24 12:49:56 wiedi Exp $
+
+don't define _XOPEN_SOURCE and __EXTENSIONS__ at the same time
+--- PctestIpv6Udp.cc.orig	2005-02-12 20:32:18.000000000 +0000
++++ PctestIpv6Udp.cc
+@@ -22,7 +22,6 @@ static char rcsid[] = "$Id: PctestIpv6Ud
+ // according to Erik Nordmark <Erik.Nordmark@eng.sun.com>.  His quick
+ // fix to do this is:
+ #ifdef NEED_XOPEN
+-#define _XOPEN_SOURCE 500
+ #define __EXTENSIONS__
+ #endif /* NEED_XOPEN */
+ 
diff --git a/net/pchar/patches/patch-ResultTable.cc b/net/pchar/patches/patch-ResultTable.cc
new file mode 100644
index 00000000000..94064059eef
--- /dev/null
+++ b/net/pchar/patches/patch-ResultTable.cc
@@ -0,0 +1,28 @@
+$NetBSD: patch-ResultTable.cc,v 1.1 2014/02/24 12:49:56 wiedi Exp $
+
+Fix "abs(int) is ambigous" on SunOS
+--- ResultTable.cc.orig	2005-02-12 20:32:18.000000000 +0000
++++ ResultTable.cc
+@@ -909,11 +909,11 @@ void ResultTable::lmsint(double &a, doub
+ 	l = 0;
+ 	for (i = 0; i < columns; i++) {
+ 	    if (partialmins[i] != timeoutresult) {
+-		residuals[l] = abs(partialmins[i] - 
++		residuals[l] = abs((double)(partialmins[i] - 
+ 				   ((currentslope * 
+ 				     column2size(i) /
+ 				     slopescale) +
+-				    currentintercept));
++				    currentintercept)));
+ 		ys[l] = partialmins[i];
+ 		
+ 		l++;
+@@ -930,7 +930,7 @@ void ResultTable::lmsint(double &a, doub
+ 	l = 0;
+ 	for (i = 0; i < columns; i++) {
+ 	    if (partialmins[i] != timeoutresult) {
+-		ys[l] = abs(partialmins[i] - mediany);
++		ys[l] = abs((double)(partialmins[i] - mediany));
+ 		l++;
+ 	    }
+ 	}