From b7533c18393c2b6d0e1e4dba620d87215611ce6c Mon Sep 17 00:00:00 2001
From: amcewen <amcewen@bcs.org.uk>
Date: Sun, 28 Aug 2011 22:26:07 +0100
Subject: [PATCH] Final changes to integrate latest core updates to WiFly
 branch

---
 hardware/arduino/cores/arduino/NetClient.h | 7 +++----
 libraries/Ethernet/Client.h                | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/hardware/arduino/cores/arduino/NetClient.h b/hardware/arduino/cores/arduino/NetClient.h
index ea64664e7..35bfa0a7b 100644
--- 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
index 1d360063a..6717cf128 100644
--- a/libraries/Ethernet/Client.h
+++ b/libraries/Ethernet/Client.h
@@ -24,8 +24,6 @@ public:
   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;