summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2024-03-13 23:22:31 +0000
committerJohn-Mark Bell <jmb@netsurf-browser.org>2024-03-13 23:22:31 +0000
commitbda0a97fea93993eaf3632103d01315fc3b8017d (patch)
tree6c33377fb7983ecbce51bbe0a2524e03a2a86800
parente3a6ad7173d8746af0fde87a1ead69c1c7d61bfa (diff)
downloadnetsurf-bda0a97fea93993eaf3632103d01315fc3b8017d.tar.gz
netsurf-bda0a97fea93993eaf3632103d01315fc3b8017d.tar.bz2
Socket: fix win32/aos3 build
-rw-r--r--content/urldb.c5
-rw-r--r--desktop/gui_factory.c3
-rw-r--r--utils/inet.h5
3 files changed, 6 insertions, 7 deletions
diff --git a/content/urldb.c b/content/urldb.c
index 7352d67c3..881f76f6d 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -115,11 +115,6 @@
#include "content/content.h"
#include "content/urldb.h"
-#ifdef WITH_AMISSL
-/* AmiSSL needs everything to be using bsdsocket directly to avoid conflicts */
-#include <proto/bsdsocket.h>
-#endif
-
/**
* cookie entry.
*
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index c9dcd8b2b..d93508890 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -21,12 +21,11 @@
#include <stdbool.h>
#include <string.h>
#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
#include "utils/config.h"
#include "utils/errors.h"
#include "utils/file.h"
+#include "utils/inet.h"
#include "netsurf/bitmap.h"
#include "content/hlcache.h"
#include "content/backing_store.h"
diff --git a/utils/inet.h b/utils/inet.h
index da1798432..e385982c1 100644
--- a/utils/inet.h
+++ b/utils/inet.h
@@ -40,6 +40,11 @@
#include <arpa/inet.h>
#include <sys/select.h>
+#ifdef WITH_AMISSL
+/* AmiSSL needs everything to be using bsdsocket directly to avoid conflicts */
+#include <proto/bsdsocket.h>
+#endif
+
#else
#include <winsock2.h>