Fix compilation on API cores

Fixes #39

Author: facchinm

src/libmodbus/modbus-tcp.cpp

@@ -28,6 +28,7 @@
 # define SHUT_RDWR 2
 # define close closesocket
 #elif defined(ARDUINO)
+#include "Arduino.h"
 #ifndef DEBUG
 #define printf(...) {}
 #define fprintf(...) {}
@@ -738,7 +739,11 @@ int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection)
 
 
 #ifdef ARDUINO
+#ifdef __NEED_NAMESPACE__
+int modbus_tcp_accept(modbus_t *ctx, arduino::Client* client)
+#else
 int modbus_tcp_accept(modbus_t *ctx, Client* client)
+#endif
 #else
 int modbus_tcp_accept(modbus_t *ctx, int *s)
 #endif
@@ -913,7 +918,11 @@ const modbus_backend_t _modbus_tcp_pi_backend = {
 #endif
 
 #ifdef ARDUINO
+#ifdef __NEED_NAMESPACE__
+modbus_t* modbus_new_tcp(arduino::Client* client, arduino::IPAddress ip_address, int port)
+#else
 modbus_t* modbus_new_tcp(Client* client, IPAddress ip_address, int port)
+#endif
 #else
 modbus_t* modbus_new_tcp(const char *ip, int port)
 #endif

src/libmodbus/modbus-tcp.h

@@ -12,13 +12,16 @@
 // check if __has_include ArduinoAPI
 #if defined __has_include
 #  if __has_include("api/ArduinoAPI.h")
-#define NEED_NAMESPACE
+#define __NEED_NAMESPACE__
 namespace arduino {
 #  endif
 #endif
 class Client;
 class IPAddress;
 #endif
+#ifdef __NEED_NAMESPACE__
+}
+#endif
 
 #include "modbus.h"
 
@@ -53,9 +56,14 @@ MODBUS_BEGIN_DECLS
 #define MODBUS_TCP_MAX_ADU_LENGTH  260
 
 #ifdef ARDUINO
+#ifdef __NEED_NAMESPACE__
+MODBUS_API modbus_t* modbus_new_tcp(arduino::Client* client, arduino::IPAddress ip_address, int port);
+MODBUS_API int modbus_tcp_accept(modbus_t *ctx, arduino::Client* client);
+#else
 MODBUS_API modbus_t* modbus_new_tcp(Client* client, IPAddress ip_address, int port);
-MODBUS_API int modbus_tcp_listen(modbus_t *ctx);
 MODBUS_API int modbus_tcp_accept(modbus_t *ctx, Client* client);
+#endif
+MODBUS_API int modbus_tcp_listen(modbus_t *ctx);
 #else
 MODBUS_API modbus_t* modbus_new_tcp(const char *ip_address, int port);
 MODBUS_API int modbus_tcp_listen(modbus_t *ctx, int nb_connection);
@@ -68,10 +76,4 @@ MODBUS_API int modbus_tcp_pi_accept(modbus_t *ctx, int *s);
 
 MODBUS_END_DECLS
 
-#ifdef NEED_NAMESPACE
-}
-#endif
-
-#undef NEED_NAMESPACE
-
 #endif /* MODBUS_TCP_H */