[core] consistent inclusion of sys-time.h

src/base.h

@@ -2,14 +2,7 @@
 #define _BASE_H_
 #include "first.h"
 
-#include <sys/types.h>
-#include <sys/time.h>
-
-#if defined(__APPLE__) && defined(__MACH__)
-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
-#include <time.h>
-#endif
-#endif
+#include "sys-time.h"
 
 #include "base_decls.h"
 #include "buffer.h"

src/buffer.c

@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>       /* strftime() */
+#include "sys-time.h"   /* strftime() */
 
 static const char hex_chars_lc[] = "0123456789abcdef";
 static const char hex_chars_uc[] = "0123456789ABCDEF";

src/fdevent.c

@@ -7,13 +7,13 @@
 
 #include <sys/types.h>
 #include "sys-socket.h"
+#include "sys-time.h"
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <time.h>
 
 #ifdef SOCK_CLOEXEC
 static int use_sock_cloexec;

src/fdevent_select.c

@@ -4,9 +4,8 @@
 #include "fdevent.h"
 #include "buffer.h"
 
-#include <sys/time.h>
+#include "sys-time.h"
 
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 

src/h2.h

@@ -2,15 +2,7 @@
 #define LI_H2_H
 #include "first.h"
 
-/* time_t */
-#include <sys/types.h>
-#include <sys/time.h>
-
-#if defined(__APPLE__) && defined(__MACH__)
-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
-#include <time.h>
-#endif
-#endif
+#include "sys-time.h"
 
 #include "base_decls.h"
 #include "buffer.h"

src/log.c

@@ -20,12 +20,6 @@
 # include <syslog.h>
 #endif
 
-#ifndef HAVE_CLOCK_GETTIME
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>  /* gettimeofday() */
-#endif
-#endif
-
 time_t log_epoch_secs = 0;
 time_t log_monotonic_secs = 0;
 

src/mod_cml.c

@@ -8,7 +8,6 @@
 #include "plugin.h"
 
 #include <sys/stat.h>
-#include <time.h>
 
 #include <stdlib.h>
 #include <string.h>

src/mod_cml_funcs.c

@@ -1,7 +1,6 @@
 #include "first.h"
 
 #include <sys/stat.h>
-#include <time.h>
 
 #include <stdlib.h>
 #include <string.h>

src/mod_cml_lua.c

@@ -5,7 +5,6 @@
 #include <lauxlib.h>
 
 #include <errno.h>
-#include <time.h>
 #include <string.h>
 
 #include "mod_cml_funcs.h"

src/mod_deflate.c

@@ -101,12 +101,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "sys-mmap.h"
+#include "sys-time.h"
 
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <time.h>
 #include <unistd.h>     /* getpid() read() unlink() write() */
 
 #include "base.h"

src/mod_magnet_cache.c

@@ -4,8 +4,8 @@
 #include "log.h"
 #include "stat_cache.h"
 
+#include "sys-time.h"
 #include <stdlib.h>
-#include <time.h>
 
 #include <lualib.h>
 #include <lauxlib.h>

src/mod_rrdtool.c

@@ -7,13 +7,13 @@
 #include "plugin.h"
 #include <sys/types.h>
 #include <sys/stat.h>
+#include "sys-time.h"
 
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <time.h>
 
 typedef struct {
     const buffer *path_rrd;

src/network.c

@@ -13,7 +13,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+#include "sys-time.h"
 
 #include <errno.h>
 #include <fcntl.h>

src/rand.c

@@ -13,11 +13,11 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include "sys-time.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "sys-crypto-md.h" /* USE_LIB_CRYPTO and additional crypto lib config */

src/request.h

@@ -2,7 +2,7 @@
 #define _REQUEST_H_
 #include "first.h"
 
-#include <time.h>       /* (struct timespec) */
+#include "sys-time.h"   /* (struct timespec) */
 
 #include "base_decls.h"
 #include "buffer.h"

src/response.c

@@ -17,12 +17,12 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include "sys-time.h"
 
 #include <limits.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 
 int

src/response.h

@@ -2,12 +2,12 @@
 #define _RESPONSE_H_
 #include "first.h"
 
+#include "sys-time.h"
+
 #include "base_decls.h"
 #include "buffer.h"
 #include "array.h"
 
-#include <time.h>
-
 int http_response_parse(server *srv, request_st *r);
 
 enum {

src/server.c

@@ -29,15 +29,14 @@
 static const buffer default_server_tag = { CONST_STR_LEN(PACKAGE_DESC)+1, 0 };
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
+#include "sys-time.h"
 
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <time.h>
 #include <signal.h>
 #include <locale.h>
 

src/stat_cache.h

@@ -2,14 +2,13 @@
 #define _FILE_CACHE_H_
 #include "first.h"
 
+#include <sys/stat.h>
+#include "sys-time.h"
+
 #include "base_decls.h"
 #include "buffer.h"
 #include "array.h"
 
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-
 typedef struct stat stat_cache_st;
 
 typedef struct stat_cache_entry {