Fix compilation on ArduinoAPI cores

Author: facchinm

src/libmodbus/modbus-rtu.cpp

@@ -5,16 +5,6 @@
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
-#include <assert.h>
-
 #ifdef ARDUINO
 #include <ArduinoRS485.h>
 
@@ -24,6 +14,16 @@
 #endif
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#if !defined(_MSC_VER) && !defined(ARDUINO)
+#include <unistd.h>
+#endif
+#include <assert.h>
+
 #include "modbus-private.h"
 
 #include "modbus-rtu.h"

src/libmodbus/modbus-tcp.cpp

@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(ARDUINO)
 #include <unistd.h>
 #endif
 #include <signal.h>

src/libmodbus/modbus-tcp.h

@@ -9,6 +9,13 @@
 #define MODBUS_TCP_H
 
 #ifdef ARDUINO
+// check if __has_include ArduinoAPI
+#if defined __has_include
+#  if __has_include("api/ArduinoAPI.h")
+#define NEED_NAMESPACE
+namespace arduino {
+#  endif
+#endif
 class Client;
 class IPAddress;
 #endif
@@ -61,4 +68,10 @@ 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 */