Final changes to integrate latest core updates to WiFly branch

amcewen · amcewen · commit b7533c18393c · 2011-08-28T22:26:07.000+01:00
diff --git a/hardware/arduino/cores/arduino/NetClient.h b/hardware/arduino/cores/arduino/NetClient.h
@@ -1,6 +1,5 @@
 #ifndef netclient_h
 #define netclient_h
-#include "WProgram.h"	
 #include "Print.h"
 #include "NetClient.h"
 #include "IPAddress.h"
@@ -10,9 +9,9 @@ class NetClient : public Stream {
 public:
   virtual int connect(IPAddress ip, uint16_t port) =0;
   virtual int connect(const char *host, uint16_t port) =0;
-  virtual void write(uint8_t) =0;
-  virtual void write(const char *str) =0;
-  virtual void write(const uint8_t *buf, size_t size) =0;
+  virtual size_t write(uint8_t) =0;
+  virtual size_t write(const char *str) =0;
+  virtual size_t write(const uint8_t *buf, size_t size) =0;
   virtual int available() = 0;
   virtual int read() = 0;
   virtual int read(uint8_t *buf, size_t size) = 0;
diff --git a/libraries/Ethernet/Client.h b/libraries/Ethernet/Client.h
@@ -24,8 +24,6 @@ class Client : public NetClient {
   virtual void flush();
   virtual void stop();
   virtual uint8_t connected();
-  virtual uint8_t operator==(int);
-  virtual uint8_t operator!=(int);
   virtual operator bool();
 
   friend class Server;
