Fix some C++ issues that gcc 3.3 complains on.

5 files changed, 83 insertions, 0 deletions

diff --git a/comms/plptools/patches/patch-ah b/comms/plptools/patches/patch-ah
new file mode 100644
index 00000000000..22820f2ade8
--- /dev/null
+++ b/comms/plptools/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2004/05/24 16:09:35 kristerw Exp $
+
+--- lib/ppsocket.cc.orig	2004-05-24 12:38:15.000000000 +0200
++++ lib/ppsocket.cc	2004-05-24 17:42:47.000000000 +0200
+@@ -389,7 +389,7 @@
+ {
+ 	int i;
+ 
+-	cout << hex << (int) c << endl;
++	cout << std::hex << (int) c << endl;
+ 	i = writeTimeout(&c, 1, 0);
+ 	if (i == SOCKET_ERROR || i == 0)
+ 		return (false);
diff --git a/comms/plptools/patches/patch-ai b/comms/plptools/patches/patch-ai
new file mode 100644
index 00000000000..76926d74c74
--- /dev/null
+++ b/comms/plptools/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2004/05/24 16:09:35 kristerw Exp $
+
+--- lib/rpcsfactory.cc.orig	2004-05-24 17:48:59.000000000 +0200
++++ lib/rpcsfactory.cc	2004-05-24 17:49:16.000000000 +0200
+@@ -73,7 +73,7 @@
+ 			return NULL;
+ 		}
+ 		// Invalid protocol version
+-		cerr << "rpcsfactory::create received odd protocol version from
++		cerr << "rpcsfactory::create received odd protocol version from \
+ ncpd! (" << a << ")" << endl;
+ 	} else {
+ 		cerr << "rpcsfactory::create sent, response not 1" << endl;
diff --git a/comms/plptools/patches/patch-aj b/comms/plptools/patches/patch-aj
new file mode 100644
index 00000000000..57d872a4ed7
--- /dev/null
+++ b/comms/plptools/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2004/05/24 16:09:35 kristerw Exp $
+
+--- lib/rfsvfactory.cc.orig	2004-05-24 17:47:30.000000000 +0200
++++ lib/rfsvfactory.cc	2004-05-24 17:48:20.000000000 +0200
+@@ -74,7 +74,7 @@
+ 			return NULL;
+ 		}
+ 		// Invalid protocol version
+-		cerr << "rfsvfactory::create received odd protocol version from
++		cerr << "rfsvfactory::create received odd protocol version from \
+ ncpd! (" << a << ")" << endl;
+ 	} else {
+ 		cerr << "rfsvfactory::create sent, response not 1" << endl;
diff --git a/comms/plptools/patches/patch-ak b/comms/plptools/patches/patch-ak
new file mode 100644
index 00000000000..8d033e690f6
--- /dev/null
+++ b/comms/plptools/patches/patch-ak
@@ -0,0 +1,22 @@
+$NetBSD: patch-ak,v 1.1 2004/05/24 16:09:35 kristerw Exp $
+
+--- lib/rfsv16.cc.orig	2004-05-24 17:43:42.000000000 +0200
++++ lib/rfsv16.cc	2004-05-24 17:45:56.000000000 +0200
+@@ -670,7 +670,7 @@
+ 	do {
+ 		unsigned char buf[2000];
+ 		if ((len = fread(handle, buf, sizeof(buf))) > 0)
+-			op.write(buf, len);
++			op.write((char*)buf, len);
+ 		if (cb) {
+ 			if (!cb(len)) {
+ 				len = E_PSI_FILE_CANCEL;
+@@ -703,7 +703,7 @@
+ 	unsigned char *buff = new unsigned char[RFSV_SENDLEN];
+ 	int total = 0;
+ 	while (ip && !ip.eof()) {
+-		ip.read(buff, RFSV_SENDLEN);
++		ip.read((char*)buff, RFSV_SENDLEN);
+ 		bufferStore tmp(buff, ip.gcount());
+ 		int len = tmp.getLen();
+ 		total += len;
diff --git a/comms/plptools/patches/patch-al b/comms/plptools/patches/patch-al
new file mode 100644
index 00000000000..b65cf9f306f
--- /dev/null
+++ b/comms/plptools/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1 2004/05/24 16:09:35 kristerw Exp $
+
+--- lib/rfsv32.cc.orig	2004-05-24 17:46:31.000000000 +0200
++++ lib/rfsv32.cc	2004-05-24 17:46:59.000000000 +0200
+@@ -577,7 +577,7 @@
+ 	unsigned char *buff = new unsigned char[RFSV_SENDLEN];
+ 	do {
+ 		if ((len = fread(handle, buff, RFSV_SENDLEN)) > 0)
+-			op.write(buff, len);
++			op.write((char*)buff, len);
+ 		if (cb) {
+ 			if (!cb(len)) {
+ 				len = E_PSI_FILE_CANCEL;
+@@ -609,7 +609,7 @@
+ 	unsigned char *buff = new unsigned char[RFSV_SENDLEN];
+ 	int total = 0;
+ 	while (ip && !ip.eof()) {
+-		ip.read(buff, RFSV_SENDLEN);
++		ip.read((char*)buff, RFSV_SENDLEN);
+ 		bufferStore tmp(buff, ip.gcount());
+ 		int len = tmp.getLen();
+ 		total += len;