diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2019-03-12 23:43:04 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2019-03-12 23:43:04 +0000 |
| commit | f70c0fa6266a2d7afae95c43e6c96c00033944e5 (patch) | |
| tree | ac425efdbb186feb9e89e76f108dfcb4f027e3fc | |
| parent | 17dc6ab0150a268f8acf0bfca8c483c7e9b62268 (diff) | |
| download | netsurf-f70c0fa6266a2d7afae95c43e6c96c00033944e5.tar.gz netsurf-f70c0fa6266a2d7afae95c43e6c96c00033944e5.tar.bz2 | |
Fix some bsdsocket.library usage
NetSurf now builds against libcurl-AmiSSL
| -rw-r--r-- | content/urldb.c | 5 | ||||
| -rw-r--r-- | frontends/amiga/gui.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/content/urldb.c b/content/urldb.c index c4a5a6b22..d93cc5898 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -116,6 +116,11 @@ #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/frontends/amiga/gui.c b/frontends/amiga/gui.c index 43dd35182..cc4397ede 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -40,6 +40,12 @@ #include <proto/utility.h> #include <proto/wb.h> +#ifdef WITH_AMISSL +/* AmiSSL needs everything to use bsdsocket.library directly to avoid problems */ +#include <proto/bsdsocket.h> +#define waitselect WaitSelect +#endif + /* Other OS includes */ #include <datatypes/textclass.h> #include <devices/inputevent.h> |