From: Jouni Malinen <j@w1.fi>
Date: Mon, 12 Sep 2011 19:15:13 +0000 (+0300)
Subject: Remove time.h include from utils/includes.h
X-Git-Tag: hostap-1-bp~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=531e420dd785161086dc1d1977838d420188717b;p=thirdparty%2Fhostap.git

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 408c4f151..110cedc82 100644
--- 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 63b5c23d8..cf2a42b19 100644
--- 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 4e117585b..cb3a0240a 100644
--- 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 763dcaf43..802fdb15c 100644
--- 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>