From 88765a5e8061d183db77550cbc3678f2cc8dcbaa Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 16 Aug 2018 11:14:51 +0100 Subject: [PATCH] Consistent use of config.h across the project. --- client/CMakeLists.txt | 2 +- client/client_shared.c | 2 +- client/pub_client.c | 3 +-- client/sub_client.c | 2 +- client/sub_client_output.c | 2 +- config.mk | 2 +- lib/handle_connack.c | 2 ++ lib/handle_ping.c | 2 ++ lib/handle_pubackcomp.c | 2 ++ lib/handle_publish.c | 2 ++ lib/handle_pubrec.c | 2 ++ lib/handle_pubrel.c | 2 ++ lib/handle_suback.c | 2 ++ lib/handle_unsuback.c | 2 ++ lib/helpers.c | 2 ++ lib/logging_mosq.c | 3 +++ lib/messages_mosq.c | 2 ++ lib/packet_mosq.c | 2 ++ lib/read_handle.c | 2 ++ lib/send_connect.c | 2 ++ lib/send_disconnect.c | 2 ++ lib/send_mosq.c | 2 ++ lib/send_publish.c | 2 ++ lib/send_subscribe.c | 2 ++ lib/send_unsubscribe.c | 2 ++ lib/socks_mosq.c | 2 ++ lib/srv_mosq.c | 2 ++ lib/utf8_mosq.c | 2 ++ lib/util_mosq.c | 2 ++ lib/will_mosq.c | 2 ++ src/conf_includedir.c | 2 +- src/context.c | 4 ++-- src/database.c | 4 ++-- src/handle_connack.c | 3 ++- src/handle_connect.c | 4 ++-- src/handle_publish.c | 4 ++-- src/handle_subscribe.c | 4 ++-- src/handle_unsubscribe.c | 4 ++-- src/logging.c | 6 ++---- src/loop.c | 4 +--- src/service.c | 2 ++ src/sys_tree.c | 4 ++-- 42 files changed, 77 insertions(+), 30 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 04577564..a6b2c018 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${mosquitto_SOURCE_DIR}/lib +include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib ${STDBOOL_H_PATH} ${STDINT_H_PATH}) link_directories(${mosquitto_BINARY_DIR}/lib) diff --git a/client/client_shared.c b/client/client_shared.c index 72a585ab..d5d37256 100644 --- a/client/client_shared.c +++ b/client/client_shared.c @@ -14,7 +14,7 @@ Contributors: Roger Light - initial implementation and documentation. */ -#define _POSIX_C_SOURCE 200809L +#include "config.h" #include #include diff --git a/client/pub_client.c b/client/pub_client.c index 31bcf23a..8c729b87 100644 --- a/client/pub_client.c +++ b/client/pub_client.c @@ -14,8 +14,7 @@ Contributors: Roger Light - initial implementation and documentation. */ -/* For nanosleep */ -#define _POSIX_C_SOURCE 200809L +#include "config.h" #include #include diff --git a/client/sub_client.c b/client/sub_client.c index 1d836846..3d91ed0f 100644 --- a/client/sub_client.c +++ b/client/sub_client.c @@ -14,7 +14,7 @@ Contributors: Roger Light - initial implementation and documentation. */ -#define _POSIX_C_SOURCE 200809L +#include "config.h" #include #include diff --git a/client/sub_client_output.c b/client/sub_client_output.c index 83afec8d..ab3f5e96 100644 --- a/client/sub_client_output.c +++ b/client/sub_client_output.c @@ -14,7 +14,7 @@ Contributors: Roger Light - initial implementation and documentation. */ -#define _POSIX_C_SOURCE 200809L +#include "config.h" #include #include diff --git a/config.mk b/config.mk index a8d4914a..ff4e3f3b 100644 --- a/config.mk +++ b/config.mk @@ -128,7 +128,7 @@ LIB_CXXFLAGS:=$(CFLAGS) ${CPPFLAGS} -I. -I.. -I../lib LIB_LDFLAGS:=${LDFLAGS} BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER -CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\"" +CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I.. -I../lib -DVERSION="\"${VERSION}\"" ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD), $(findstring $(UNAME),NetBSD)),) BROKER_LIBS:=-lm diff --git a/lib/handle_connack.c b/lib/handle_connack.c index 570ad3a5..9d0a01cd 100644 --- a/lib/handle_connack.c +++ b/lib/handle_connack.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include "mosquitto.h" diff --git a/lib/handle_ping.c b/lib/handle_ping.c index fdb3bdd4..17b53be0 100644 --- a/lib/handle_ping.c +++ b/lib/handle_ping.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include diff --git a/lib/handle_pubackcomp.c b/lib/handle_pubackcomp.c index 6fa162df..37788456 100644 --- a/lib/handle_pubackcomp.c +++ b/lib/handle_pubackcomp.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include diff --git a/lib/handle_publish.c b/lib/handle_publish.c index 45ee57c2..f8092f89 100644 --- a/lib/handle_publish.c +++ b/lib/handle_publish.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include diff --git a/lib/handle_pubrec.c b/lib/handle_pubrec.c index f8d32c02..59eea1b7 100644 --- a/lib/handle_pubrec.c +++ b/lib/handle_pubrec.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include diff --git a/lib/handle_pubrel.c b/lib/handle_pubrel.c index 1f29f87e..56660987 100644 --- a/lib/handle_pubrel.c +++ b/lib/handle_pubrel.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include diff --git a/lib/handle_suback.c b/lib/handle_suback.c index 807d64c9..d6e3d19c 100644 --- a/lib/handle_suback.c +++ b/lib/handle_suback.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #ifdef WITH_BROKER diff --git a/lib/handle_unsuback.c b/lib/handle_unsuback.c index 426f9e1d..6297bb10 100644 --- a/lib/handle_unsuback.c +++ b/lib/handle_unsuback.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include diff --git a/lib/helpers.c b/lib/helpers.c index fa7059ca..b1aef6aa 100644 --- a/lib/helpers.c +++ b/lib/helpers.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include diff --git a/lib/logging_mosq.c b/lib/logging_mosq.c index a9c0117f..a48f799a 100644 --- a/lib/logging_mosq.c +++ b/lib/logging_mosq.c @@ -13,6 +13,9 @@ and the Eclipse Distribution License is available at Contributors: Roger Light - initial implementation and documentation. */ + +#include "config.h" + #include #include #include diff --git a/lib/messages_mosq.c b/lib/messages_mosq.c index a5376e9e..f6c50b8b 100644 --- a/lib/messages_mosq.c +++ b/lib/messages_mosq.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c index e956adeb..686006fc 100644 --- a/lib/packet_mosq.c +++ b/lib/packet_mosq.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include diff --git a/lib/read_handle.c b/lib/read_handle.c index 5365aefa..274a4da5 100644 --- a/lib/read_handle.c +++ b/lib/read_handle.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include diff --git a/lib/send_connect.c b/lib/send_connect.c index 463e96b8..458f522f 100644 --- a/lib/send_connect.c +++ b/lib/send_connect.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include diff --git a/lib/send_disconnect.c b/lib/send_disconnect.c index da339361..0cfea276 100644 --- a/lib/send_disconnect.c +++ b/lib/send_disconnect.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #ifdef WITH_BROKER diff --git a/lib/send_mosq.c b/lib/send_mosq.c index 7189579a..ee544e3e 100644 --- a/lib/send_mosq.c +++ b/lib/send_mosq.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include diff --git a/lib/send_publish.c b/lib/send_publish.c index e52be217..e9aeeef8 100644 --- a/lib/send_publish.c +++ b/lib/send_publish.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include diff --git a/lib/send_subscribe.c b/lib/send_subscribe.c index ef0de606..c60ca0f2 100644 --- a/lib/send_subscribe.c +++ b/lib/send_subscribe.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include diff --git a/lib/send_unsubscribe.c b/lib/send_unsubscribe.c index 80478c3a..fb66e88c 100644 --- a/lib/send_unsubscribe.c +++ b/lib/send_unsubscribe.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include diff --git a/lib/socks_mosq.c b/lib/socks_mosq.c index c4a4dc86..1930cc73 100644 --- a/lib/socks_mosq.c +++ b/lib/socks_mosq.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include diff --git a/lib/srv_mosq.c b/lib/srv_mosq.c index e54f9d45..0219dd8a 100644 --- a/lib/srv_mosq.c +++ b/lib/srv_mosq.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #ifdef WITH_SRV # include diff --git a/lib/utf8_mosq.c b/lib/utf8_mosq.c index 8f6afeaa..7ee60559 100644 --- a/lib/utf8_mosq.c +++ b/lib/utf8_mosq.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation. */ +#include "config.h" + #include #include "mosquitto.h" diff --git a/lib/util_mosq.c b/lib/util_mosq.c index f72a830d..56d8cb05 100644 --- a/lib/util_mosq.c +++ b/lib/util_mosq.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include diff --git a/lib/will_mosq.c b/lib/will_mosq.c index 3cb6f143..3e9495ff 100644 --- a/lib/will_mosq.c +++ b/lib/will_mosq.c @@ -14,6 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include diff --git a/src/conf_includedir.c b/src/conf_includedir.c index b723eefe..43da9a16 100644 --- a/src/conf_includedir.c +++ b/src/conf_includedir.c @@ -14,7 +14,7 @@ Contributors: Roger Light - initial implementation and documentation. */ -#include +#include "config.h" #include #include diff --git a/src/context.c b/src/context.c index e30181d9..495693e9 100644 --- a/src/context.c +++ b/src/context.c @@ -14,11 +14,11 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include -#include "config.h" - #include "mosquitto_broker_internal.h" #include "memory_mosq.h" #include "packet_mosq.h" diff --git a/src/database.c b/src/database.c index 8b7f0ad3..d2f482d1 100644 --- a/src/database.c +++ b/src/database.c @@ -14,11 +14,11 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include -#include "config.h" - #include "mosquitto_broker_internal.h" #include "memory_mosq.h" #include "send_mosq.h" diff --git a/src/handle_connack.c b/src/handle_connack.c index 14b053eb..52e78e4f 100644 --- a/src/handle_connack.c +++ b/src/handle_connack.c @@ -14,7 +14,8 @@ Contributors: Roger Light - initial implementation and documentation. */ -#include +#include "config.h" + #include #include diff --git a/src/handle_connect.c b/src/handle_connect.c index b12247e9..f7f0f0ad 100644 --- a/src/handle_connect.c +++ b/src/handle_connect.c @@ -14,11 +14,11 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include -#include "config.h" - #include "mosquitto_broker_internal.h" #include "mqtt3_protocol.h" #include "memory_mosq.h" diff --git a/src/handle_publish.c b/src/handle_publish.c index 7faf3e01..54976afc 100644 --- a/src/handle_publish.c +++ b/src/handle_publish.c @@ -14,12 +14,12 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include -#include "config.h" - #include "mosquitto_broker_internal.h" #include "mqtt3_protocol.h" #include "memory_mosq.h" diff --git a/src/handle_subscribe.c b/src/handle_subscribe.c index 9750f9c3..3b2e2591 100644 --- a/src/handle_subscribe.c +++ b/src/handle_subscribe.c @@ -14,11 +14,11 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include -#include "config.h" - #include "mosquitto_broker_internal.h" #include "memory_mosq.h" #include "packet_mosq.h" diff --git a/src/handle_unsubscribe.c b/src/handle_unsubscribe.c index 1a1154a6..a0f00046 100644 --- a/src/handle_unsubscribe.c +++ b/src/handle_unsubscribe.c @@ -14,11 +14,11 @@ Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include -#include "config.h" - #include "mosquitto_broker_internal.h" #include "memory_mosq.h" #include "mqtt3_protocol.h" diff --git a/src/logging.c b/src/logging.c index 7efa896e..0b7b792a 100644 --- a/src/logging.c +++ b/src/logging.c @@ -13,6 +13,8 @@ and the Eclipse Distribution License is available at Contributors: Roger Light - initial implementation and documentation. */ +#include "config.h" + #include #include #include @@ -21,10 +23,6 @@ Contributors: #endif #include -#ifndef CMAKE -#include "config.h" -#endif - #include "mosquitto_broker_internal.h" #include "memory_mosq.h" #include "util_mosq.h" diff --git a/src/loop.c b/src/loop.c index 04481434..d1bec53e 100644 --- a/src/loop.c +++ b/src/loop.c @@ -15,9 +15,7 @@ Contributors: Tatsuzo Osawa - Add epoll. */ -#define _GNU_SOURCE - -#include +#include "config.h" #include #ifndef WIN32 diff --git a/src/service.c b/src/service.c index 005a0804..11b4b018 100644 --- a/src/service.c +++ b/src/service.c @@ -16,6 +16,8 @@ Contributors: #if defined(WIN32) || defined(__CYGWIN__) +#include "config.h" + #include #include "memory_mosq.h" diff --git a/src/sys_tree.c b/src/sys_tree.c index 0d9c8bce..ebece86b 100644 --- a/src/sys_tree.c +++ b/src/sys_tree.c @@ -16,11 +16,11 @@ Contributors: #ifdef WITH_SYS_TREE +#include "config.h" + #include #include -#include "config.h" - #include "mosquitto_broker_internal.h" #include "memory_mosq.h" #include "time_mosq.h"