path: root/content
diff options
authorVincent Sanders <>2016-04-17 13:42:28 +0100
committerVincent Sanders <>2016-04-17 13:42:28 +0100
commitade0cd8bb95ce20b520cb3b13600d04130f52976 (patch)
treedf5bb0c1cdbf00d2c01a07358ac05574c0a1aec8 /content
parent810e9153d1b4d9ed8e208eece4ee88b0d3867ec0 (diff)
Reduce unecessary use of networking headers
The utility configuration header dragged in a number of bsd sockets and related API as a side effect of setting up the configuration. By splitting the header and API setup into a separate header only the small number of places that need the functionality explitly include it.
Diffstat (limited to 'content')
3 files changed, 4 insertions, 3 deletions
diff --git a/content/fetchers.h b/content/fetchers.h
index c8f8300b8..92b11dc69 100644
--- a/content/fetchers.h
+++ b/content/fetchers.h
@@ -25,7 +25,7 @@
-#include "utils/config.h"
+#include "utils/inet.h" /* this is necessary for the fd_set definition */
#include <libwapcaplet/libwapcaplet.h>
struct nsurl;
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 88c8bbe41..e789ce558 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -27,7 +27,8 @@
* The CURL handles are cached in the curl_handle_ring.
-#include "utils/config.h"
+/* must come first to ensure winsock2.h vs windows.h ordering issues */
+#include "utils/inet.h"
#include <assert.h>
#include <errno.h>
diff --git a/content/urldb.c b/content/urldb.c
index 1afa13131..0b59e1f4d 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -96,7 +96,7 @@
#include <strings.h>
#include <time.h>
-#include "utils/config.h"
+#include "utils/inet.h"
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/corestrings.h"