move sys/time.h support functionality out of generic header

The utils header is a large collection of functionality for several
system headers and API. This splits out the ones from sys/time.h into
a separate header reducing the need for many unconnected source files
to include the system header unecessarily.

4 files changed, 54 insertions, 29 deletions

diff --git a/utils/log.c b/utils/log.c
index 43bfbd522..15a7a9e75 100644
--- a/utils/log.c
+++ b/utils/log.c
@@ -22,9 +22,9 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/time.h>
 
 #include "utils/config.h"
+#include "utils/sys_time.h"
 #include "utils/utsname.h"
 #include "desktop/version.h"
 
diff --git a/utils/sys_time.h b/utils/sys_time.h
new file mode 100644
index 000000000..82d88fd25
--- /dev/null
+++ b/utils/sys_time.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2016 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * \brief BSD style time functions
+ */
+
+#ifndef _NETSURF_UTILS_SYS_TIME_H_
+#define _NETSURF_UTILS_SYS_TIME_H_
+
+#include <sys/time.h>
+
+#ifndef timeradd
+#define timeradd(a, aa, result)						\
+	do {								\
+		(result)->tv_sec = (a)->tv_sec + (aa)->tv_sec;		\
+		(result)->tv_usec = (a)->tv_usec + (aa)->tv_usec;	\
+		if ((result)->tv_usec >= 1000000) {			\
+			++(result)->tv_sec;				\
+			(result)->tv_usec -= 1000000;			\
+		}							\
+	} while (0)
+#endif
+
+#ifndef timersub
+#define timersub(a, aa, result)						\
+	do {								\
+		(result)->tv_sec = (a)->tv_sec - (aa)->tv_sec;		\
+		(result)->tv_usec = (a)->tv_usec - (aa)->tv_usec;	\
+		if ((result)->tv_usec < 0) {				\
+			--(result)->tv_sec;				\
+			(result)->tv_usec += 1000000;			\
+		}							\
+	} while (0)
+#endif
+
+#endif
diff --git a/utils/utils.c b/utils/utils.c
index 50704eae2..53c0fbe38 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -28,7 +28,6 @@
 #include <strings.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/time.h>
 #include <regex.h>
 #include <time.h>
 #include <errno.h>
diff --git a/utils/utils.h b/utils/utils.h
index 4b5360c5c..39a7254b0 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -31,7 +31,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <sys/time.h>
 #include <regex.h>
 #include <assert.h>
 #include <stdarg.h>
@@ -119,32 +118,6 @@ struct dirent;
 #define SLEN(x) (sizeof((x)) - 1)
 
 
-#ifndef timeradd
-#define timeradd(a, aa, result)						\
-	do {								\
-		(result)->tv_sec = (a)->tv_sec + (aa)->tv_sec;		\
-		(result)->tv_usec = (a)->tv_usec + (aa)->tv_usec;	\
-		if ((result)->tv_usec >= 1000000) {			\
-			++(result)->tv_sec;				\
-			(result)->tv_usec -= 1000000;			\
-		}							\
-	} while (0)
-#endif
-
-#ifndef timersub
-#define timersub(a, aa, result)						\
-	do {								\
-		(result)->tv_sec = (a)->tv_sec - (aa)->tv_sec;		\
-		(result)->tv_usec = (a)->tv_usec - (aa)->tv_usec;	\
-		if ((result)->tv_usec < 0) {				\
-			--(result)->tv_sec;				\
-			(result)->tv_usec += 1000000;			\
-		}							\
-	} while (0)
-#endif
-
-
-
 /**
  * Replace consecutive whitespace with a single space.
  *