From 57ee8b92bc3f4c76ba0f367f642cab6f1c996376 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Mon, 16 Apr 2018 11:48:42 +0100 Subject: [PATCH] Mac build fixes. --- lib/handle_ping.c | 7 ++++--- lib/handle_pubackcomp.c | 8 ++++---- lib/handle_pubrec.c | 8 ++++---- lib/handle_pubrel.c | 8 ++++---- lib/handle_suback.c | 8 ++++---- lib/handle_unsuback.c | 7 ++++--- lib/send_connect.c | 8 ++++---- lib/send_disconnect.c | 8 ++++---- lib/send_mosq.c | 14 +++++++------- lib/send_publish.c | 17 +++++++---------- lib/send_subscribe.c | 8 ++++---- lib/send_unsubscribe.c | 9 ++++----- lib/util_mosq.c | 8 ++++---- lib/will_mosq.c | 4 ++++ src/plugin.c | 2 +- 15 files changed, 63 insertions(+), 61 deletions(-) diff --git a/lib/handle_ping.c b/lib/handle_ping.c index f53021a9..fdb3bdd4 100644 --- a/lib/handle_ping.c +++ b/lib/handle_ping.c @@ -18,6 +18,10 @@ Contributors: #include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "logging_mosq.h" #include "memory_mosq.h" @@ -28,9 +32,6 @@ Contributors: #include "read_handle.h" #include "send_mosq.h" #include "util_mosq.h" -#ifdef WITH_BROKER -#include "mosquitto_broker_internal.h" -#endif int handle__pingreq(struct mosquitto *mosq) { diff --git a/lib/handle_pubackcomp.c b/lib/handle_pubackcomp.c index 67749b4f..6fa162df 100644 --- a/lib/handle_pubackcomp.c +++ b/lib/handle_pubackcomp.c @@ -18,6 +18,10 @@ Contributors: #include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "logging_mosq.h" #include "memory_mosq.h" @@ -29,10 +33,6 @@ Contributors: #include "send_mosq.h" #include "util_mosq.h" -#ifdef WITH_BROKER -# include "mosquitto_broker_internal.h" -#endif - #ifdef WITH_BROKER int handle__pubackcomp(struct mosquitto_db *db, struct mosquitto *mosq, const char *type) diff --git a/lib/handle_pubrec.c b/lib/handle_pubrec.c index a6a8a073..f8d32c02 100644 --- a/lib/handle_pubrec.c +++ b/lib/handle_pubrec.c @@ -18,6 +18,10 @@ Contributors: #include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "logging_mosq.h" #include "memory_mosq.h" @@ -28,10 +32,6 @@ Contributors: #include "read_handle.h" #include "send_mosq.h" #include "util_mosq.h" -#ifdef WITH_BROKER -#include "mosquitto_broker_internal.h" -#endif - int handle__pubrec(struct mosquitto *mosq) { diff --git a/lib/handle_pubrel.c b/lib/handle_pubrel.c index 09e5db7d..1f29f87e 100644 --- a/lib/handle_pubrel.c +++ b/lib/handle_pubrel.c @@ -18,6 +18,10 @@ Contributors: #include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "logging_mosq.h" #include "memory_mosq.h" @@ -29,10 +33,6 @@ Contributors: #include "send_mosq.h" #include "util_mosq.h" -#ifdef WITH_BROKER -# include "mosquitto_broker_internal.h" -#endif - int handle__pubrel(struct mosquitto_db *db, struct mosquitto *mosq) { diff --git a/lib/handle_suback.c b/lib/handle_suback.c index 45da13e2..807d64c9 100644 --- a/lib/handle_suback.c +++ b/lib/handle_suback.c @@ -16,16 +16,16 @@ Contributors: #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "mosquitto_internal.h" #include "logging_mosq.h" #include "memory_mosq.h" #include "packet_mosq.h" -#ifdef WITH_BROKER -# include "mosquitto_broker_internal.h" -#endif - int handle__suback(struct mosquitto *mosq) { diff --git a/lib/handle_unsuback.c b/lib/handle_unsuback.c index 95c11ebc..426f9e1d 100644 --- a/lib/handle_unsuback.c +++ b/lib/handle_unsuback.c @@ -18,6 +18,10 @@ Contributors: #include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "logging_mosq.h" #include "memory_mosq.h" @@ -28,9 +32,6 @@ Contributors: #include "read_handle.h" #include "send_mosq.h" #include "util_mosq.h" -#ifdef WITH_BROKER -#include "mosquitto_broker_internal.h" -#endif int handle__unsuback(struct mosquitto *mosq) diff --git a/lib/send_connect.c b/lib/send_connect.c index 956ae70a..463e96b8 100644 --- a/lib/send_connect.c +++ b/lib/send_connect.c @@ -17,6 +17,10 @@ Contributors: #include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "logging_mosq.h" #include "memory_mosq.h" #include "mosquitto.h" @@ -24,10 +28,6 @@ Contributors: #include "mqtt3_protocol.h" #include "packet_mosq.h" -#ifdef WITH_BROKER -# include "mosquitto_broker_internal.h" -#endif - int send__connect(struct mosquitto *mosq, uint16_t keepalive, bool clean_session) { struct mosquitto__packet *packet = NULL; diff --git a/lib/send_disconnect.c b/lib/send_disconnect.c index ba6eb6af..da339361 100644 --- a/lib/send_disconnect.c +++ b/lib/send_disconnect.c @@ -16,16 +16,16 @@ Contributors: #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "mosquitto_internal.h" #include "logging_mosq.h" #include "mqtt3_protocol.h" #include "send_mosq.h" -#ifdef WITH_BROKER -# include "mosquitto_broker_internal.h" -#endif - int send__disconnect(struct mosquitto *mosq) { diff --git a/lib/send_mosq.c b/lib/send_mosq.c index 91127165..7189579a 100644 --- a/lib/send_mosq.c +++ b/lib/send_mosq.c @@ -18,6 +18,13 @@ Contributors: #include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +# include "sys_tree.h" +#else +# define G_PUB_BYTES_SENT_INC(A) +#endif + #include "mosquitto.h" #include "mosquitto_internal.h" #include "logging_mosq.h" @@ -29,13 +36,6 @@ Contributors: #include "time_mosq.h" #include "util_mosq.h" -#ifdef WITH_BROKER -# include "mosquitto_broker_internal.h" -# include "sys_tree.h" -#else -# define G_PUB_BYTES_SENT_INC(A) -#endif - int send__pingreq(struct mosquitto *mosq) { int rc; diff --git a/lib/send_publish.c b/lib/send_publish.c index 7ff82d07..e52be217 100644 --- a/lib/send_publish.c +++ b/lib/send_publish.c @@ -15,9 +15,15 @@ Contributors: */ #include -//#include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +# include "sys_tree.h" +#else +# define G_PUB_BYTES_SENT_INC(A) +#endif + #include "mosquitto.h" #include "mosquitto_internal.h" #include "logging_mosq.h" @@ -26,15 +32,6 @@ Contributors: #include "net_mosq.h" #include "packet_mosq.h" #include "send_mosq.h" -//#include "time_mosq.h" -//#include "util_mosq.h" - -#ifdef WITH_BROKER -# include "mosquitto_broker_internal.h" -# include "sys_tree.h" -#else -# define G_PUB_BYTES_SENT_INC(A) -#endif int send__publish(struct mosquitto *mosq, uint16_t mid, const char *topic, uint32_t payloadlen, const void *payload, int qos, bool retain, bool dup) diff --git a/lib/send_subscribe.c b/lib/send_subscribe.c index 62335bed..ef0de606 100644 --- a/lib/send_subscribe.c +++ b/lib/send_subscribe.c @@ -17,6 +17,10 @@ Contributors: #include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "mosquitto_internal.h" #include "logging_mosq.h" @@ -25,10 +29,6 @@ Contributors: #include "packet_mosq.h" #include "util_mosq.h" -#ifdef WITH_BROKER -# include "mosquitto_broker_internal.h" -#endif - int send__subscribe(struct mosquitto *mosq, int *mid, const char *topic, uint8_t topic_qos) { diff --git a/lib/send_unsubscribe.c b/lib/send_unsubscribe.c index a6f2445e..80478c3a 100644 --- a/lib/send_unsubscribe.c +++ b/lib/send_unsubscribe.c @@ -17,18 +17,17 @@ Contributors: #include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "logging_mosq.h" #include "memory_mosq.h" #include "mqtt3_protocol.h" -//#include "net_mosq.h" #include "packet_mosq.h" -//#include "send_mosq.h" #include "util_mosq.h" -#ifdef WITH_BROKER -# include "mosquitto_broker_internal.h" -#endif int send__unsubscribe(struct mosquitto *mosq, int *mid, const char *topic) { diff --git a/lib/util_mosq.c b/lib/util_mosq.c index aab313dd..b85b95ce 100644 --- a/lib/util_mosq.c +++ b/lib/util_mosq.c @@ -27,6 +27,10 @@ Contributors: #endif +#ifdef WITH_BROKER +#include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "memory_mosq.h" #include "net_mosq.h" @@ -35,10 +39,6 @@ Contributors: #include "tls_mosq.h" #include "util_mosq.h" -#ifdef WITH_BROKER -#include "mosquitto_broker_internal.h" -#endif - #ifdef WITH_WEBSOCKETS #include #endif diff --git a/lib/will_mosq.c b/lib/will_mosq.c index d7fc45df..3cb6f143 100644 --- a/lib/will_mosq.c +++ b/lib/will_mosq.c @@ -17,6 +17,10 @@ Contributors: #include #include +#ifdef WITH_BROKER +# include "mosquitto_broker_internal.h" +#endif + #include "mosquitto.h" #include "mosquitto_internal.h" #include "logging_mosq.h" diff --git a/src/plugin.c b/src/plugin.c index fe7cc79d..3365bfbf 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -16,9 +16,9 @@ Contributors: #include "config.h" +#include "mosquitto_broker_internal.h" #include "mosquitto_internal.h" #include "mosquitto_broker.h" -#include "mosquitto_broker_internal.h" #ifdef WITH_TLS # include