File plp_1_7-gcc4-fix.diff of Package psion_lp

--- ncp/channel.h
+++ ncp/channel.h
@@ -15,11 +15,11 @@
 
   void setNcpChannel(int chan);
   void ncpSend(bufferStore &a);
-  virtual void ncpDataCallback(bufferStore &a) = NULL;
-  virtual const char *getNcpConnectName() = NULL;
+  virtual void ncpDataCallback(bufferStore &a) = 0;
+  virtual const char *getNcpConnectName() = 0;
   void ncpConnect();
-  virtual void ncpConnectAck() = NULL;
-  virtual void ncpConnectTerminate() = NULL;
+  virtual void ncpConnectAck() = 0;
+  virtual void ncpConnectTerminate() = 0;
   void ncpDisconnect();
 
   // The following two calls are used for destructing an instance
--- utils/bufferstore.h
+++ utils/bufferstore.h
@@ -2,7 +2,7 @@
 #define _bufferstore_h
 
 #include "bool.h"
-class ostream;
+#include <ostream>
 
 class bufferStore {
 public:
@@ -19,7 +19,7 @@
   unsigned int getDWord(long pos) const;
   const char* getString(long pos=0) const;
   void discardFirstBytes(int n);
-  friend ostream &operator<<(ostream &s, const bufferStore &m);
+  friend std::ostream &operator<<(std::ostream &s, const bufferStore &m);
   bool empty() const;
 
   // Writing utils
--- utils/ppsocket.h
+++ utils/ppsocket.h
@@ -9,6 +9,7 @@
 #include <netdb.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <cerrno>
 
 #ifndef TRUE
 #define  TRUE		-1
@@ -24,7 +25,6 @@
 #define  SOCKET_ERROR	-1
 #define  INFINITE	0
 
-extern int errno;
 
 #include "bool.h"
 class bufferStore;