Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/f70c0fa6266a2d7afae95c43e6c96c00033944e5
...commit
http://git.netsurf-browser.org/netsurf.git/commit/f70c0fa6266a2d7afae95c43e6c96c00033944e5
...tree
http://git.netsurf-browser.org/netsurf.git/tree/f70c0fa6266a2d7afae95c43e6c96c00033944e5
The branch, chris/amissl has been updated
via f70c0fa6266a2d7afae95c43e6c96c00033944e5 (commit)
via 17dc6ab0150a268f8acf0bfca8c483c7e9b62268 (commit)
from 0cdee38e8e579f271d27df727fe29477dcd0a389 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=f70c0fa6266a2d7afae95c43e6c96c00033944e5
commit f70c0fa6266a2d7afae95c43e6c96c00033944e5
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix some bsdsocket.library usage
NetSurf now builds against libcurl-AmiSSL
diff --git a/content/urldb.c b/content/urldb.c
index c4a5a6b..d93cc58 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 43dd351..cc4397e 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>
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=17dc6ab0150a268f8acf0bfca8c483c7e9b62268
commit 17dc6ab0150a268f8acf0bfca8c483c7e9b62268
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Try to avoid errno errors
This doesn't appear to work as expected, better to delete
netinclude/errno.h which only includes sys/errno.h anyway.
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 8c71a99..850c941 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -12,7 +12,7 @@ endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
$(eval $(call
feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
-$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API
-I/opt/netsurf/m68k-unknown-amigaos/cross/m68k-unknown-amigaos/netinclude,-lamisslauto,AmiSSL))
+$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API
-D__NO_NETINCLUDE_ERRNO
-I/opt/netsurf/m68k-unknown-amigaos/cross/m68k-unknown-amigaos/netinclude,-lamisslauto,AmiSSL))
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
-----------------------------------------------------------------------
Summary of changes:
content/urldb.c | 5 +++++
frontends/amiga/Makefile | 2 +-
frontends/amiga/gui.c | 6 ++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/content/urldb.c b/content/urldb.c
index c4a5a6b..d93cc58 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/Makefile b/frontends/amiga/Makefile
index 8c71a99..850c941 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -12,7 +12,7 @@ endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
$(eval $(call
feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
-$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API
-I/opt/netsurf/m68k-unknown-amigaos/cross/m68k-unknown-amigaos/netinclude,-lamisslauto,AmiSSL))
+$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API
-D__NO_NETINCLUDE_ERRNO
-I/opt/netsurf/m68k-unknown-amigaos/cross/m68k-unknown-amigaos/netinclude,-lamisslauto,AmiSSL))
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 43dd351..cc4397e 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>
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
