Remove time.h include from utils/includes.h

os_*() wrappers should be used instead of functions from time.h.
Removing the header from includes.h enforces this. os_unix.c can
include this its uses are valid wrapper calls. wps_upnp.c uses
gmtime() for which there is no os_*() wrapper available yet, so
allow it to use time.h, too. Similarly, allow dump_state.c to
use time.h for ctime().

diff --git a/hostapd/dump_state.c b/hostapd/dump_state.c
index 408c4f1518a0f8eaed409466dff59bfa04287720..110cedc82fbb4cbe46831df5a486dcb9f89df81a 100644 (file)
--- a/hostapd/dump_state.c
+++ b/hostapd/dump_state.c
@@ -13,6 +13,7 @@
  */
 
 #include "utils/includes.h"
+#include <time.h>
 
 #include "utils/common.h"
 #include "radius/radius_client.h"

diff --git a/src/utils/includes.h b/src/utils/includes.h
index 63b5c23d84907040fa552a6ef46f6811282aaf85..cf2a42b19d42aff221f9e66a33f8b878db0fe3b2 100644 (file)
--- a/src/utils/includes.h
+++ b/src/utils/includes.h
@@ -34,7 +34,6 @@
 #include <errno.h>
 #endif /* _WIN32_WCE */
 #include <ctype.h>
-#include <time.h>
 
 #ifndef CONFIG_TI_COMPILER
 #ifndef _MSC_VER

diff --git a/src/utils/os_unix.c b/src/utils/os_unix.c
index 4e117585b0501250061080317038613ccf6d994a..cb3a0240a7f0d6f99872c5c6a1c1455aa03a5318 100644 (file)
--- a/src/utils/os_unix.c
+++ b/src/utils/os_unix.c
@@ -14,6 +14,8 @@
 
 #include "includes.h"
 
+#include <time.h>
+
 #ifdef ANDROID
 #include <linux/capability.h>
 #include <linux/prctl.h>

diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
index 763dcaf43a39264c871acec6b6e0a6527b45c176..802fdb15cd0c078a2aab7a5400e0cfde8aae51aa 100644 (file)
--- a/src/wps/wps_upnp.c
+++ b/src/wps/wps_upnp.c
@@ -172,7 +172,7 @@
 
 #include "includes.h"
 
-#include <assert.h>
+#include <time.h>
 #include <net/if.h>
 #include <netdb.h>
 #include <sys/ioctl.h>