Consistent use of config.h across the project.

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)
 

client/client_shared.c

@@ -14,7 +14,7 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#define _POSIX_C_SOURCE 200809L
+#include "config.h"
 
 #include <errno.h>
 #include <fcntl.h>

client/pub_client.c

@@ -14,8 +14,7 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-/* For nanosleep */
-#define _POSIX_C_SOURCE 200809L
+#include "config.h"
 
 #include <errno.h>
 #include <fcntl.h>

client/sub_client.c

@@ -14,7 +14,7 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#define _POSIX_C_SOURCE 200809L
+#include "config.h"
 
 #include <assert.h>
 #include <errno.h>

client/sub_client_output.c

@@ -14,7 +14,7 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#define _POSIX_C_SOURCE 200809L
+#include "config.h"
 
 #include <assert.h>
 #include <errno.h>

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

lib/handle_connack.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 
 #include "mosquitto.h"

lib/handle_ping.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

lib/handle_pubackcomp.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

lib/handle_publish.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
 

lib/handle_pubrec.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

lib/handle_pubrel.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

lib/handle_suback.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 
 #ifdef WITH_BROKER

lib/handle_unsuback.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

lib/helpers.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <errno.h>
 #include <stdbool.h>
 

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 <assert.h>
 #include <stdarg.h>
 #include <stdio.h>

lib/messages_mosq.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>

lib/packet_mosq.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <string.h>

lib/read_handle.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

lib/send_connect.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
 

lib/send_disconnect.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 
 #ifdef WITH_BROKER

lib/send_mosq.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>

lib/send_publish.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
 

lib/send_subscribe.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
 

lib/send_unsubscribe.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
 

lib/socks_mosq.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <errno.h>
 #include <string.h>
 

lib/srv_mosq.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #ifdef WITH_SRV
 # include <ares.h>
 

lib/utf8_mosq.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation.
 */
 
+#include "config.h"
+
 #include <stdio.h>
 #include "mosquitto.h"
 

lib/util_mosq.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
 

lib/will_mosq.c

@@ -14,6 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 

src/conf_includedir.c

@@ -14,7 +14,7 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <limits.h>
 #include <stdio.h>

src/context.c

@@ -14,11 +14,11 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <time.h>
 
-#include "config.h"
-
 #include "mosquitto_broker_internal.h"
 #include "memory_mosq.h"
 #include "packet_mosq.h"

src/database.c

@@ -14,11 +14,11 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 
-#include "config.h"
-
 #include "mosquitto_broker_internal.h"
 #include "memory_mosq.h"
 #include "send_mosq.h"

src/handle_connack.c

@@ -14,7 +14,8 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
-#include <config.h>
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 

src/handle_connect.c

@@ -14,11 +14,11 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
-
 #include "mosquitto_broker_internal.h"
 #include "mqtt3_protocol.h"
 #include "memory_mosq.h"

src/handle_publish.c

@@ -14,12 +14,12 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
-
 #include "mosquitto_broker_internal.h"
 #include "mqtt3_protocol.h"
 #include "memory_mosq.h"

src/handle_subscribe.c

@@ -14,11 +14,11 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
-
 #include "mosquitto_broker_internal.h"
 #include "memory_mosq.h"
 #include "packet_mosq.h"

src/handle_unsubscribe.c

@@ -14,11 +14,11 @@ and the Eclipse Distribution License is available at
  Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
-
 #include "mosquitto_broker_internal.h"
 #include "memory_mosq.h"
 #include "mqtt3_protocol.h"

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 <stdarg.h>
 #include <stdio.h>
 #include <string.h>
@@ -21,10 +23,6 @@ and the Eclipse Distribution License is available at
 #endif
 #include <time.h>
 
-#ifndef CMAKE
-#include "config.h"
-#endif
-
 #include "mosquitto_broker_internal.h"
 #include "memory_mosq.h"
 #include "util_mosq.h"