Make build with gcc3.

12 files changed, 204 insertions, 27 deletions

diff --git a/comms/plp/distinfo b/comms/plp/distinfo
index 22b0ad7de5c..32b52f1185f 100644
--- a/comms/plp/distinfo
+++ b/comms/plp/distinfo
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.8 2004/08/30 06:27:55 recht Exp $
+$NetBSD: distinfo,v 1.9 2004/09/08 12:47:39 wiz Exp $
 
 SHA1 (plp_1_8.tar.gz) = cad586353091895b6efc556d2cb5fa16891a3749
 Size (plp_1_8.tar.gz) = 58424 bytes
-SHA1 (patch-aa) = 0aa07f8542acbd9180cfbfb4230e50eb97e45cb9
-SHA1 (patch-ab) = 41314372a3f5f5723393c0cf42c20d4257b170b6
+SHA1 (patch-aa) = de823cbd6f27bfc4245af8d9de100a3a48ac258c
+SHA1 (patch-ab) = 9404e7c991d8b9e5abc358f90b91392833aa80d7
 SHA1 (patch-ac) = 9f196ba3c236629c6ed1b59842fb6de2716917a6
 SHA1 (patch-ad) = 4a6421d7256498df6293011bafc76e75cc5512e6
 SHA1 (patch-ae) = 29b0cde6353c257a01a1630981f229c6673bbe73
-SHA1 (patch-af) = f8c668a5891e51637f2b0cdaf7036c8632b3965d
-SHA1 (patch-ag) = 354183a25f00d951e5cbc25e64b11b1daac21939
-SHA1 (patch-ah) = e0a90f7f8f70ab94f252af28d0d6ecbb878265df
-SHA1 (patch-ai) = 88ec3fd405e7b19003d91e37dbcf739f948e7c03
+SHA1 (patch-af) = 0ab78ff48fbd42b45bd59468eb24297f44802ef5
+SHA1 (patch-ag) = c6610f91ba3216aaca6fbf74620e64b1657e711e
+SHA1 (patch-ah) = bd381b9d8bbd68e985e6323c775324093fe7fbfe
+SHA1 (patch-ai) = 82b2a9af4d88bb27ea8c196f1b2ecdc39d7c9d24
+SHA1 (patch-aj) = 4973bd796ce661c6a4dcf11c8a774e0d6450480b
+SHA1 (patch-ak) = 28ca61ae1f6b1a02f349bf57f5f351c55c3b7575
+SHA1 (patch-al) = c8dc10319e174159efc6d838928a39bdb0446feb
+SHA1 (patch-am) = b3453d4cfb48a6daeae9aea896b261cae7db489f
+SHA1 (patch-ao) = eabe7562e75c3ab9900a889ffe14813a9faad01b
diff --git a/comms/plp/patches/patch-aa b/comms/plp/patches/patch-aa
index a03d0f196ee..03f122ad7bc 100644
--- a/comms/plp/patches/patch-aa
+++ b/comms/plp/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2001/04/22 17:43:19 skrll Exp $
+$NetBSD: patch-aa,v 1.4 2004/09/08 12:47:39 wiz Exp $
 
---- defaults.h.orig	Tue Nov  2 20:51:01 1999
+--- defaults.h.orig	1999-11-02 21:51:01.000000000 +0100
 +++ defaults.h
 @@ -19,7 +19,7 @@
  
diff --git a/comms/plp/patches/patch-ab b/comms/plp/patches/patch-ab
index f0a01424abe..90f89152a5c 100644
--- a/comms/plp/patches/patch-ab
+++ b/comms/plp/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.3 2001/04/22 17:43:19 skrll Exp $
+$NetBSD: patch-ab,v 1.4 2004/09/08 12:47:39 wiz Exp $
 
---- ncp/mp_serial.c.orig	Tue Nov  2 20:47:06 1999
+--- ncp/mp_serial.c.orig	1999-11-02 21:47:06.000000000 +0100
 +++ ncp/mp_serial.c
-@@ -223,8 +223,8 @@
+@@ -37,7 +37,7 @@
+ #ifdef sun
+ # include <sys/ttold.h>	/* sun has TIOCEXCL there */
+ #endif
+-#if defined (__SVR4)
++#if defined (__SVR4) || defined(__NetBSD__)
+ #include <stdlib.h>
+ #endif
+ 
+@@ -223,8 +223,8 @@ int init_serial(const char *dev, int spe
  void ser_exit(int fd)
  {
    struct termios ti;
diff --git a/comms/plp/patches/patch-af b/comms/plp/patches/patch-af
index f46971843f0..d0433a45a94 100644
--- a/comms/plp/patches/patch-af
+++ b/comms/plp/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.6 2002/11/14 23:58:34 jlam Exp $
+$NetBSD: patch-af,v 1.7 2004/09/08 12:47:39 wiz Exp $
 
---- Makefile.orig	Tue Nov  2 16:05:02 1999
+--- Makefile.orig	1999-11-02 22:05:02.000000000 +0100
 +++ Makefile
 @@ -16,18 +16,12 @@
  
@@ -25,7 +25,7 @@ $NetBSD: patch-af,v 1.6 2002/11/14 23:58:34 jlam Exp $
  
  #######################################
  # You shouldn't need to look any further..
-@@ -38,20 +32,23 @@
+@@ -38,20 +32,23 @@ export AR
  export LD
  export LIBS
  
@@ -58,7 +58,7 @@ $NetBSD: patch-af,v 1.6 2002/11/14 23:58:34 jlam Exp $
  
  clean:
  	cd utils; $(MAKE) clean
-@@ -59,7 +56,7 @@
+@@ -59,7 +56,7 @@ clean:
  	cd rfsv; $(MAKE) clean
  	rm -f ncp.log *~ core
  
diff --git a/comms/plp/patches/patch-ag b/comms/plp/patches/patch-ag
index 740e0ab411e..a87163a3669 100644
--- a/comms/plp/patches/patch-ag
+++ b/comms/plp/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2000/10/10 12:12:10 pooka Exp $
+$NetBSD: patch-ag,v 1.2 2004/09/08 12:47:39 wiz Exp $
 
---- rfsv/rfsv16.cc.orig	Wed Nov  3 00:01:01 1999
-+++ rfsv/rfsv16.cc	Tue Oct 10 15:06:29 2000
-@@ -113,7 +113,7 @@
+--- rfsv/rfsv16.cc.orig	1999-11-02 23:01:01.000000000 +0100
++++ rfsv/rfsv16.cc
+@@ -113,7 +113,7 @@ int rfsv16::dir(const char* dirName, buf
        if (version != 2) return 1;
        int status = a.getWord(2);
        long size = a.getDWord(4);
@@ -11,3 +11,12 @@ $NetBSD: patch-ag,v 1.1 2000/10/10 12:12:10 pooka Exp $
        const char *s = a.getString(16);
        a.discardFirstBytes(17+strlen(s));
  
+@@ -238,7 +238,7 @@ int rfsv16::write(const char* localName,
+   }
+   unsigned char * buff = new unsigned char [RFSV_SENDLEN];
+   while (ip &&!ip.eof()) {
+-    ip.read(buff, RFSV_SENDLEN);
++    ip.read((char *)buff, RFSV_SENDLEN);
+     bufferStore tmp(buff, ip.gcount());
+     if (tmp.getLen() == 0) break;
+     bufferStore a;
diff --git a/comms/plp/patches/patch-ah b/comms/plp/patches/patch-ah
index ac04eff1d36..c49a1f1e5d9 100644
--- a/comms/plp/patches/patch-ah
+++ b/comms/plp/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2000/10/10 12:12:10 pooka Exp $
+$NetBSD: patch-ah,v 1.2 2004/09/08 12:47:39 wiz Exp $
 
---- rfsv/rfsv32.cc.orig	Tue Nov  2 23:12:47 1999
-+++ rfsv/rfsv32.cc	Tue Oct 10 15:07:34 2000
-@@ -183,7 +183,7 @@
+--- rfsv/rfsv32.cc.orig	1999-11-02 22:12:47.000000000 +0100
++++ rfsv/rfsv32.cc
+@@ -183,7 +183,7 @@ int rfsv32::dir(const char* dirName, buf
  	  us += modLow;
  	  us /= 1000000;
  	  us -= (1970*365 + 490)*60*60*24;
@@ -11,3 +11,25 @@ $NetBSD: patch-ah,v 1.1 2000/10/10 12:12:10 pooka Exp $
  	  char dateBuff[100];
  	  struct tm *t;
  	  t = gmtime(&date);
+@@ -275,10 +275,10 @@ void rfsv32::opErr(long status) {
+   case BAD_HANDLE:
+     cerr << "BAD_HANDLE";
+     break;
+-  case OVERFLOW:
++  case E_OVERFLOW:
+     cerr << "OVERFLOW";
+     break;
+-  case UNDERFLOW:
++  case E_UNDERFLOW:
+     cerr << "UNDERFLOW";
+     break;
+   case ALREADY_EXISTS:
+@@ -455,7 +455,7 @@ int rfsv32::write(const char* localName,
+   }
+   unsigned char * buff = new unsigned char [RFSV_SENDLEN];
+   while (ip &&!ip.eof()) {
+-    ip.read(buff, RFSV_SENDLEN);
++    ip.read((char *)buff, RFSV_SENDLEN);
+     bufferStore tmp(buff, ip.gcount());
+     if (tmp.getLen() == 0) break;
+     bufferStore a;
diff --git a/comms/plp/patches/patch-ai b/comms/plp/patches/patch-ai
index a1c72a22b96..6f767ecc8d7 100644
--- a/comms/plp/patches/patch-ai
+++ b/comms/plp/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 2002/07/17 17:41:25 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2004/09/08 12:47:39 wiz Exp $
 
---- utils/ppsocket.cc.orig	Mon Apr 12 23:17:08 1999
+--- utils/ppsocket.cc.orig	1999-04-12 23:17:08.000000000 +0200
 +++ utils/ppsocket.cc
-@@ -198,7 +198,7 @@
+@@ -198,7 +198,7 @@ bool ppsocket::listen(char* Host, int Po
  
  ppsocket* ppsocket::accept(char* Peer, int MaxLen)
  { 
@@ -11,3 +11,12 @@ $NetBSD: patch-ai,v 1.1 2002/07/17 17:41:25 wiz Exp $
    ppsocket* accepted;
    char* peer;
  
+@@ -421,7 +421,7 @@ bool ppsocket::sputc(char c)
+ { 
+   int i;
+ 
+-  cout << hex << (int)c << endl;
++  cout << std::hex << (int)c << endl;
+   
+   i = writeTimeout(&c, 1, 0);
+     
diff --git a/comms/plp/patches/patch-aj b/comms/plp/patches/patch-aj
new file mode 100644
index 00000000000..25000402909
--- /dev/null
+++ b/comms/plp/patches/patch-aj
@@ -0,0 +1,46 @@
+$NetBSD: patch-aj,v 1.1 2004/09/08 12:47:39 wiz Exp $
+
+--- ncp/link.cc.orig	1999-04-12 23:49:12.000000000 +0200
++++ ncp/link.cc
+@@ -30,7 +30,7 @@
+ #include "bufferstore.h"
+ #include "bufferarray.h"
+ 
+-link::link(const char *fname, int baud, IOWatch &iow, bool _s5, bool _verbose) :
++Link::Link(const char *fname, int baud, IOWatch &iow, bool _s5, bool _verbose) :
+   s5(_s5)
+ {
+   p = new packet(fname, baud, iow, PACKET_LAYER_DIAGNOSTICS);
+@@ -43,16 +43,16 @@ link::link(const char *fname, int baud, 
+   failed = false;
+ }
+ 
+-link::~link() {
++Link::~Link() {
+   delete p;
+ }
+ 
+-void link::send(const bufferStore &buff) {
++void Link::send(const bufferStore &buff) {
+   if (buff.getLen() > 300) abort();
+   sendQueue.pushBuffer(buff);
+ }
+ 
+-bufferArray link::poll() {
++bufferArray Link::poll() {
+   bufferArray ret;
+   bufferStore buff;
+   unsigned char type;
+@@ -145,10 +145,10 @@ bufferArray link::poll() {
+   return ret;
+ }
+ 
+-bool link::stuffToSend() {
++bool Link::stuffToSend() {
+   return (somethingToSend || !sendQueue.empty());
+ }
+ 
+-bool link::hasFailed() {
++bool Link::hasFailed() {
+   return failed;
+ }
diff --git a/comms/plp/patches/patch-ak b/comms/plp/patches/patch-ak
new file mode 100644
index 00000000000..f7a989ec1e4
--- /dev/null
+++ b/comms/plp/patches/patch-ak
@@ -0,0 +1,18 @@
+$NetBSD: patch-ak,v 1.1 2004/09/08 12:47:39 wiz Exp $
+
+--- ncp/link.h.orig	1999-04-12 23:20:41.000000000 +0200
++++ ncp/link.h
+@@ -7,10 +7,10 @@
+ class packet;
+ class IOWatch;
+ 
+-class link {
++class Link {
+ public:
+-  link(const char *fname, int baud, IOWatch &iow, bool s5, bool _verbose = false);
+-  ~link();
++  Link(const char *fname, int baud, IOWatch &iow, bool s5, bool _verbose = false);
++  ~Link();
+   void send(const bufferStore &buff);
+   bufferArray poll();
+   bool stuffToSend();
diff --git a/comms/plp/patches/patch-al b/comms/plp/patches/patch-al
new file mode 100644
index 00000000000..79379816277
--- /dev/null
+++ b/comms/plp/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2004/09/08 12:47:39 wiz Exp $
+
+--- ncp/ncp.cc.orig	1999-04-12 23:27:06.000000000 +0200
++++ ncp/ncp.cc
+@@ -33,7 +33,7 @@
+ ncp::ncp(const char *fname, int baud, IOWatch &iow, bool _s5) :
+   s5(_s5)
+ {
+-  l = new link(fname, baud, iow, s5, LINK_LAYER_DIAGNOSTICS);
++  l = new Link(fname, baud, iow, s5, LINK_LAYER_DIAGNOSTICS);
+   gotLinkChan = false;
+   failed = false;
+   
diff --git a/comms/plp/patches/patch-am b/comms/plp/patches/patch-am
new file mode 100644
index 00000000000..21a78259c65
--- /dev/null
+++ b/comms/plp/patches/patch-am
@@ -0,0 +1,31 @@
+$NetBSD: patch-am,v 1.1 2004/09/08 12:47:39 wiz Exp $
+
+--- ncp/ncp.h.orig	1999-04-12 23:22:43.000000000 +0200
++++ ncp/ncp.h
+@@ -3,7 +3,7 @@
+ 
+ #include "bool.h"
+ #include "bufferstore.h"
+-class link;
++class Link;
+ class channel;
+ class IOWatch;
+ 
+@@ -21,6 +21,8 @@ public:
+   bool gotLinkChannel();
+   
+ private:
++  friend class Link;
++
+   enum c { MAX_LEN = 200, LAST_MESS = 1, NOT_LAST_MESS = 2 };
+   enum interControllerMessageType {
+     // Inter controller message types
+@@ -37,7 +39,7 @@ private:
+   void decodeControlMessage(bufferStore &buff);
+   void controlChannel(int chan, enum interControllerMessageType t, bufferStore &command);
+   
+-  link *l;
++  Link *l;
+   channel *channelPtr[8];
+   bufferStore messageList[8];
+   int remoteChanList[8];
diff --git a/comms/plp/patches/patch-ao b/comms/plp/patches/patch-ao
new file mode 100644
index 00000000000..571b0b6b5f3
--- /dev/null
+++ b/comms/plp/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2004/09/08 12:47:39 wiz Exp $
+
+--- rfsv/rfsv32.h.orig	1999-04-12 23:17:21.000000000 +0200
++++ rfsv/rfsv32.h
+@@ -83,8 +83,8 @@ private:
+     ARGUMENT=-6,
+     TOTAL_LOSS_OF_PRECISION=-7,
+     BAD_HANDLE=-8,
+-    OVERFLOW=-9,
+-    UNDERFLOW=-10,
++    E_OVERFLOW=-9,
++    E_UNDERFLOW=-10,
+     ALREADY_EXISTS=-11,
+     PATH_NOT_FOUND=-12,
+     DIED=-13,