From 40e6a757097cc8e8e5908cb4dfd9687298839be3 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Fri, 6 Apr 2018 00:33:22 +0100
Subject: [PATCH] Use c99 as compiling standard.

Closes: #765.
---
 client/client_shared.c          |   2 ++
 client/pub_client.c             |   9 +++++++--
 client/sub_client_output.c      |   2 ++
 config.h                        |   1 +
 config.mk                       |   6 +++---
 lib/mosquitto.c                 |   5 +++--
 lib/time_mosq.c                 |   2 ++
 lib/tls_mosq.c                  |   3 +++
 src/bridge.c                    |   4 ++--
 src/conf.c                      |   3 ++-
 src/conf_includedir.c           |   1 +
 src/mosquitto_passwd.c          |   2 ++
 test/broker/c/auth_plugin_v2.so | Bin 8512 -> 0 bytes
 13 files changed, 30 insertions(+), 10 deletions(-)
 delete mode 100755 test/broker/c/auth_plugin_v2.so

diff --git a/client/client_shared.c b/client/client_shared.c
index e4d8891d..2afe2e66 100644
--- a/client/client_shared.c
+++ b/client/client_shared.c
@@ -14,6 +14,7 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#define _POSIX_C_SOURCE 200809L
 
 #include <errno.h>
 #include <fcntl.h>
@@ -22,6 +23,7 @@ Contributors:
 #include <string.h>
 #ifndef WIN32
 #include <unistd.h>
+#include <strings.h>
 #else
 #include <process.h>
 #include <winsock2.h>
diff --git a/client/pub_client.c b/client/pub_client.c
index b39abc21..7d596ada 100644
--- a/client/pub_client.c
+++ b/client/pub_client.c
@@ -14,6 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+/* For nanosleep */
+#define _POSIX_C_SOURCE 200809L
 
 #include <errno.h>
 #include <fcntl.h>
@@ -21,7 +23,7 @@ Contributors:
 #include <stdlib.h>
 #include <string.h>
 #ifndef WIN32
-#include <unistd.h>
+#include <time.h>
 #else
 #include <process.h>
 #include <winsock2.h>
@@ -442,7 +444,10 @@ int main(int argc, char *argv[])
 #ifdef WIN32
 				Sleep(100);
 #else
-				usleep(100000);
+				struct timespec ts;
+				ts.tv_sec = 0;
+				ts.tv_nsec = 100000000;
+				nanosleep(&ts, NULL);
 #endif
 			}
 			rc = MOSQ_ERR_SUCCESS;
diff --git a/client/sub_client_output.c b/client/sub_client_output.c
index f11f13fd..1ca207b7 100644
--- a/client/sub_client_output.c
+++ b/client/sub_client_output.c
@@ -14,6 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#define _POSIX_C_SOURCE 199309L
+
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/config.h b/config.h
index 6d80bbd1..0b10a8f4 100644
--- a/config.h
+++ b/config.h
@@ -28,3 +28,4 @@
 #define uthash_malloc(sz) mosquitto__malloc(sz)
 #define uthash_free(ptr,sz) mosquitto__free(ptr)
 
+#define _POSIX_C_SOURCE 200809L
diff --git a/config.mk b/config.mk
index 01850274..b1476d2e 100644
--- a/config.mk
+++ b/config.mk
@@ -123,12 +123,12 @@ else
 	CFLAGS?=-Wall -ggdb -O2
 endif
 
-LIB_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I. -I.. -I../lib
+LIB_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I. -I.. -I../lib -std=c99
 LIB_CXXFLAGS:=$(LIB_CFLAGS) ${CPPFLAGS}
 LIB_LDFLAGS:=${LDFLAGS}
 
-BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER
-CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\""
+BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER -std=c99
+CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\"" -std=c99
 
 ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD)),)
 	BROKER_LIBS:=-lm
diff --git a/lib/mosquitto.c b/lib/mosquitto.c
index 575a6ebe..56a4fb1d 100644
--- a/lib/mosquitto.c
+++ b/lib/mosquitto.c
@@ -14,12 +14,15 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #ifndef WIN32
+#include <strings.h>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <unistd.h>
@@ -45,8 +48,6 @@ typedef int ssize_t;
 #include "util_mosq.h"
 #include "will_mosq.h"
 
-#include "config.h"
-
 #if !defined(WIN32) && !defined(__SYMBIAN32__)
 #define HAVE_PSELECT
 #endif
diff --git a/lib/time_mosq.c b/lib/time_mosq.c
index 16a9c291..888eb644 100644
--- a/lib/time_mosq.c
+++ b/lib/time_mosq.c
@@ -14,6 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #ifdef __APPLE__
 #include <mach/mach.h>
 #include <mach/mach_time.h>
diff --git a/lib/tls_mosq.c b/lib/tls_mosq.c
index 2a78ab18..77557ea6 100644
--- a/lib/tls_mosq.c
+++ b/lib/tls_mosq.c
@@ -16,12 +16,15 @@ Contributors:
 
 #ifdef WITH_TLS
 
+#include "config.h"
+
 #ifdef WIN32
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
 #else
 #  include <arpa/inet.h>
 #  include <sys/socket.h>
+#  include <strings.h>
 #endif
 
 #include <string.h>
diff --git a/src/bridge.c b/src/bridge.c
index 6cea9995..40149910 100644
--- a/src/bridge.c
+++ b/src/bridge.c
@@ -14,6 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#include "config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -27,8 +29,6 @@ Contributors:
 #include <ws2tcpip.h>
 #endif
 
-#include "config.h"
-
 #include "mosquitto.h"
 #include "mosquitto_broker_internal.h"
 #include "mosquitto_internal.h"
diff --git a/src/conf.c b/src/conf.c
index e79b79b2..7ee1736a 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -14,7 +14,7 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <limits.h>
 #include <stdio.h>
@@ -25,6 +25,7 @@ Contributors:
 #ifdef WIN32
 #else
 #  include <dirent.h>
+#  include <strings.h>
 #endif
 
 #ifndef WIN32
diff --git a/src/conf_includedir.c b/src/conf_includedir.c
index 4a528d52..cf1b48f8 100644
--- a/src/conf_includedir.c
+++ b/src/conf_includedir.c
@@ -28,6 +28,7 @@ Contributors:
 #endif
 
 #ifndef WIN32
+#  include <strings.h>
 #  include <netdb.h>
 #  include <sys/socket.h>
 #else
diff --git a/src/mosquitto_passwd.c b/src/mosquitto_passwd.c
index 0523a3b4..4d62a436 100644
--- a/src/mosquitto_passwd.c
+++ b/src/mosquitto_passwd.c
@@ -14,6 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#define _POSIX_C_SOURCE 200809L
+#define _BSD_SOURCE
 
 #include <errno.h>
 #include <openssl/evp.h>
diff --git a/test/broker/c/auth_plugin_v2.so b/test/broker/c/auth_plugin_v2.so
deleted file mode 100755
index 3b7d95e5ac902c098ee6ec8d92df921e286be94b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8512
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