- Changes for compiling with gcc 3.2

9 files changed, 39 insertions, 26 deletions

diff --git a/ncpd/channel.cc b/ncpd/channel.cc
index d3189e4..5401499 100644
--- a/ncpd/channel.cc
+++ b/ncpd/channel.cc
@@ -24,7 +24,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <stream.h>
+#include <iostream>
 #include <string>
 
 #include "channel.h"
diff --git a/ncpd/link.cc b/ncpd/link.cc
index 9aab182..84c1d89 100644
--- a/ncpd/link.cc
+++ b/ncpd/link.cc
@@ -25,18 +25,20 @@
 #include "config.h"
 #endif
 
-#include <stream.h>
+#include <iostream>
+
+#include <bufferstore.h>
+#include <bufferarray.h>
+#include <plp_inttypes.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/time.h>
-#include <plp_inttypes.h>
 
 #include "link.h"
 #include "packet.h"
 #include "ncp.h"
-#include "bufferstore.h"
-#include "bufferarray.h"
 #include "main.h"
 
 extern "C" {
diff --git a/ncpd/linkchan.cc b/ncpd/linkchan.cc
index aa21bb1..7c2a231 100644
--- a/ncpd/linkchan.cc
+++ b/ncpd/linkchan.cc
@@ -21,14 +21,14 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include <stream.h>
 #include <iomanip>
 #include <string>
 
+#include <bufferstore.h>
+#include <bufferarray.h>
+
 #include "linkchan.h"
 #include "ncp.h"
-#include "bufferstore.h"
-#include "bufferarray.h"
 #include "main.h"
 
 using namespace std;
diff --git a/ncpd/main.cc b/ncpd/main.cc
index 7f2ff3e..4d0595e 100644
--- a/ncpd/main.cc
+++ b/ncpd/main.cc
@@ -25,9 +25,15 @@
 #include "config.h"
 #endif
 
-#include <stdio.h>
 #include <string>
-#include <stream.h>
+#include <iostream>
+
+#include <bufferstore.h>
+#include <ppsocket.h>
+#include <iowatch.h>
+#include <log.h>
+
+#include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
@@ -38,14 +44,10 @@
 #include <plpintl.h>
 
 #include "ncp.h"
-#include "bufferstore.h"
-#include "ppsocket.h"
 #include "socketchan.h"
-#include "iowatch.h"
 #include "linkchan.h"
 #include "link.h"
 #include "packet.h"
-#include "log.h"
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
diff --git a/ncpd/main.h b/ncpd/main.h
index 1af2c9a..ef45414 100644
--- a/ncpd/main.h
+++ b/ncpd/main.h
@@ -24,7 +24,7 @@
 #ifndef _main_h_
 #define _main_h_
 
-#include <ostream.h>
+#include <iostream>
 
 extern std::ostream lout;
 extern std::ostream lerr;
diff --git a/ncpd/mp_serial.h b/ncpd/mp_serial.h
index da559e4..40d465f 100644
--- a/ncpd/mp_serial.h
+++ b/ncpd/mp_serial.h
@@ -24,8 +24,14 @@
 #ifndef _mp_serial_h
 #define _mp_serial_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 int init_serial(const char *dev, int speed, int debug);
 void ser_exit(int fd);
+#ifdef __cplusplus
+}
+#endif
 
 #endif
 
diff --git a/ncpd/ncp.cc b/ncpd/ncp.cc
index 3507804..1bc39a3 100644
--- a/ncpd/ncp.cc
+++ b/ncpd/ncp.cc
@@ -25,8 +25,9 @@
 #include <config.h>
 #endif
 
-#include <stream.h>
+#include <iostream>
 #include <string>
+
 #include <time.h>
 
 #include <bufferstore.h>
diff --git a/ncpd/packet.cc b/ncpd/packet.cc
index d352fc9..48f2a5e 100644
--- a/ncpd/packet.cc
+++ b/ncpd/packet.cc
@@ -25,22 +25,21 @@
 #include <config.h>
 #endif
 
+#include <string>
+#include <fstream>
+#include <iomanip>
+
 #include <stdio.h>
 #include <malloc.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <string>
-#include <fstream>
-#include <iomanip>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <signal.h>
 
-extern "C" {
 #include "mp_serial.h"
-}
 #include "packet.h"
 #include "link.h"
 #include "main.h"
diff --git a/ncpd/socketchan.cc b/ncpd/socketchan.cc
index d0b22bf..0d74549 100644
--- a/ncpd/socketchan.cc
+++ b/ncpd/socketchan.cc
@@ -24,17 +24,20 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <stream.h>
+
+#include <string>
+
+#include <ppsocket.h>
+#include <rfsv.h>
+
 #include <stdio.h>
-#include <string.h>
 #include <malloc.h>
 
 #include "socketchan.h"
 #include "ncp.h"
-#include <ppsocket.h>
-#include <rfsv.h>
+#include "main.h"
 
-extern std::ostream lerr;
+using namespace std;
 
 socketChan:: socketChan(ppsocket * _skt, ncp * _ncpController):
     channel(_ncpController)