changes for Arduino core 2.5.0

src/mqtt.c

@@ -29,6 +29,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include "mqtt/mqtt.h"
 #include "user_interface.h"
 #include "osapi.h"
 #include "espconn.h"
@@ -38,7 +39,6 @@
 #include "mqtt/debug.h"
 #include "user_config.h"
 #include "mqtt/defaults.h"
-#include "mqtt/mqtt.h"
 #include "mqtt/queue.h"
 
 #define MQTT_TASK_PRIO            2

src/mqtt/mqtt.h

@@ -34,6 +34,11 @@
 #include "user_interface.h"
 
 #include "queue.h"
+
+#ifndef ipv4_addr_t
+#define ipv4_addr_t ip_addr_t
+#endif
+
 typedef struct mqtt_event_data_t
 {
   uint8_t type;

src/mqtt/mqtt_server.h

@@ -6,13 +6,12 @@
 #include "osapi.h"
 #include "os_type.h"
 //#include "ip_addr.h"
+#include "mqtt.h"
 #include "espconn.h"
 //#include "lwip/ip.h"
 //#include "lwip/app/espconn.h"
 //#include "lwip/app/espconn_tcp.h"
 
-#include "mqtt.h"
-
 #define LOCAL_MQTT_CLIENT ((void*)-1)
 
 typedef bool (*MqttAuthCallback)(const char* username, const char *password, struct espconn *pesp_conn);

src/uMQTTBroker.h

@@ -5,6 +5,10 @@
 #include "IPAddress.h"
 #include "string.h"
 
+#ifndef ipv4_addr_t
+#define ipv4_addr_t ip_addr_t
+#endif
+
 extern "C" {
 
 // Interface for starting the broker