cassyarduino cassyarduino / UIPEthernet

UIPEthernet library for Arduino IDE, Eclipse with arduino plugin and MBED/SMeshStudio (AVR,STM32F,ESP8266,Intel ARC32,Nordic nRF51,Teensy boards,Realtek Ameba(RTL8195A,RTL8710)), ENC28j60 network chip. Compatible with Wiznet W5100 Ethernet library API. Compiled and tested on Nucleo-F302R8. Master repository is: https://github.com/UIPEthernet/UIPEthernet/

Diff: UIPClient.h

Revision:
9:312e0937630f
Parent:
8:b9332109461d
Child:
10:cd62b2205c2a
--- a/UIPClient.h	Wed Dec 28 15:56:02 2016 +0000
+++ b/UIPClient.h	Thu Dec 29 10:41:59 2016 +0000
@@ -22,12 +22,12 @@
 
 #include "ethernet_comp.h"
 #if defined(ARDUINO)
-   #include "Print.h"
-   #include "Client.h"
+  #include "Print.h"
+  #include "Client.h"
 #endif
 #if defined(__MBED__)
-   #include "mbed/Print.h"
-   #include "mbed/Client.h"
+  #include "mbed/Print.h"
+  #include "mbed/Client.h"
 #endif
 #include "utility/mempool.h"
 #include "utility/logging.h"
@@ -67,12 +67,7 @@
 #endif
 } uip_userdata_t;
 
-#if defined(__MBED__)
-  class UIPClient : public Print, public Client {
-#else    
-  class UIPClient : public Client {
-#endif
-
+class UIPClient : public Print, public Client {
 public:
   UIPClient();
   virtual int connect(IPAddress ip, uint16_t port);
@@ -91,9 +86,7 @@
   virtual int peek();
   virtual void flush();
 
-//#if defined(ARDUINO)
   using Print::write;
-//#endif
 
 private:
   UIPClient(struct uip_conn *_conn);
@@ -104,7 +97,7 @@
   static uip_userdata_t all_data[UIP_CONNS];
   static uip_userdata_t* _allocateData();
 
-  static size_t _write(uip_userdata_t *,const uint8_t *buf, size_t size);
+  static int16_t _write(uip_userdata_t *,const uint8_t *buf, size_t size);
   static int _available(uip_userdata_t *);
 
   static uint8_t _currentBlock(memhandle* blocks);