cmake: Correctly check for sys/[u]time.h

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

3 files changed, 11 insertions, 8 deletions

diff --git a/src/log.c b/src/log.c
index a72dd412..79afbce7 100644
--- a/src/log.c
+++ b/src/log.c
@@ -24,11 +24,12 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#ifndef _WIN32
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif /* HAVE_SYS_TIME_H */
+#ifdef HAVE_SYS_UTIME_H
 #include <sys/utime.h>
-#endif
+#endif /* HAVE_SYS_TIME_H */
 #include <time.h>
 
 #include "libssh/priv.h"
diff --git a/src/misc.c b/src/misc.c
index 64cda47b..a3aa1b93 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -33,10 +33,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
-
 #endif /* _WIN32 */
 
 #include <limits.h>
@@ -47,6 +43,10 @@
 #include <sys/types.h>
 #include <ctype.h>
 #include <time.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif /* HAVE_SYS_TIME_H */
+
 
 #ifdef _WIN32
 
diff --git a/src/pcap.c b/src/pcap.c
index 043326b2..bfb237ba 100644
--- a/src/pcap.c
+++ b/src/pcap.c
@@ -29,9 +29,11 @@
 #include <ws2tcpip.h>
 #else
 #include <netinet/in.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif /* HAVE_SYS_TIME_H */
 #include <errno.h>
 #include <stdlib.h>