netsurf: branch master updated. release/3.9-538-gb371454

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/b37145434425e4cd76ce8... ...commit http://git.netsurf-browser.org/netsurf.git/commit/b37145434425e4cd76ce844... ...tree http://git.netsurf-browser.org/netsurf.git/tree/b37145434425e4cd76ce844f9... The branch, master has been updated via b37145434425e4cd76ce844f9bae9538c50d75ae (commit) via 47b689c5e9d4ab4ecc7c629951c1a4534d0a0733 (commit) via 9664a8ac76802ff1c6700c1e748b38b3de9baef1 (commit) via 962431dd3df0062e5762165eb69dfc23608c8aad (commit) from 0e6ba162b22ca64b323ed9071c64a3e31b93c0f6 (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=b37145434425e4cd76c... commit b37145434425e4cd76ce844f9bae9538c50d75ae Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; AmiSSL implies OpenSSL diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index a88fc1d..ff4f85b 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 -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL)) +$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -DWITH_OPENSSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL)) CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include CFLAGS += $(shell $(PKG_CONFIG) --cflags tre) commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=47b689c5e9d4ab4ecc7... commit 47b689c5e9d4ab4ecc7c629951c1a4534d0a0733 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Use nsamiga as defined in makefile diff --git a/utils/file.c b/utils/file.c index c963719..c460e49 100644 --- a/utils/file.c +++ b/utils/file.c @@ -38,7 +38,7 @@ #include "utils/file.h" #include "utils/dirent.h" -#ifdef __AMIGA__ +#ifdef nsamiga #include "frontends/amiga/os3support.h" #endif commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9664a8ac76802ff1c67... commit 9664a8ac76802ff1c6700c1e748b38b3de9baef1 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Mod os3support files so file.c builds diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c index 645496b..98843c7 100644 --- a/frontends/amiga/os3support.c +++ b/frontends/amiga/os3support.c @@ -28,7 +28,6 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> -#include <dirent.h> #include <proto/bullet.h> #include <proto/exec.h> @@ -182,6 +181,12 @@ char *strsep(char **s1, const char *s2) return p1; } +int alphasort(const struct dirent **d1, const struct dirent **d2) +{ + /*\todo stub function, needs writing, preferably into clib2 */ + return 0; +} + int scandir(const char *dir, struct dirent ***namelist, int (*filter)(const struct dirent *), int (*compar)(const struct dirent **, const struct dirent **)) diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h index fde032a..dc4e065 100644 --- a/frontends/amiga/os3support.h +++ b/frontends/amiga/os3support.h @@ -27,6 +27,7 @@ #ifndef __amigaos4__ #include <stdint.h> +#include <dirent.h> #include <proto/exec.h> #include <proto/dos.h> @@ -257,6 +258,10 @@ char *ASPrintf(const char *fmt, ...); /* C */ char *strlwr(char *str); +int alphasort(const struct dirent **d1, const struct dirent **d2); +int scandir(const char *dir, struct dirent ***namelist, + int (*filter)(const struct dirent *), + int (*compar)(const struct dirent **, const struct dirent **)); #endif #endif diff --git a/utils/file.c b/utils/file.c index 7eff6a7..c963719 100644 --- a/utils/file.c +++ b/utils/file.c @@ -38,6 +38,10 @@ #include "utils/file.h" #include "utils/dirent.h" +#ifdef __AMIGA__ +#include "frontends/amiga/os3support.h" +#endif + /** * Generate a posix path from one or more component elemnts. * commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=962431dd3df0062e576... commit 962431dd3df0062e5762165eb69dfc23608c8aad Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Rename mask to msk There's something about "mask" which causes the version of GCC we use for the m68k-amigaos build to misinterpret the code diff --git a/include/netsurf/plot_style.h b/include/netsurf/plot_style.h index fee7a10..6f2977f 100644 --- a/include/netsurf/plot_style.h +++ b/include/netsurf/plot_style.h @@ -214,7 +214,7 @@ static inline colour colour_engorge_component( bool dark, enum plot_colour_component comp) { - static const colour mask[PLOT_COLOUR_COMPONENT_ALPHA] = { + static const colour msk[PLOT_COLOUR_COMPONENT_ALPHA] = { [PLOT_COLOUR_COMPONENT_RED] = 0x0000ff, [PLOT_COLOUR_COMPONENT_GREEN] = 0x00ff00, [PLOT_COLOUR_COMPONENT_BLUE] = 0xff0000, @@ -224,7 +224,7 @@ static inline colour colour_engorge_component( assert(comp < PLOT_COLOUR_COMPONENT_ALPHA); - return (mask[comp] & l) | (~mask[comp] & d); + return (msk[comp] & l) | (~msk[comp] & d); } ----------------------------------------------------------------------- Summary of changes: frontends/amiga/Makefile | 2 +- frontends/amiga/os3support.c | 7 ++++++- frontends/amiga/os3support.h | 5 +++++ include/netsurf/plot_style.h | 4 ++-- utils/file.c | 4 ++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index a88fc1d..ff4f85b 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 -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL)) +$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -DWITH_OPENSSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL)) CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include CFLAGS += $(shell $(PKG_CONFIG) --cflags tre) diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c index 645496b..98843c7 100644 --- a/frontends/amiga/os3support.c +++ b/frontends/amiga/os3support.c @@ -28,7 +28,6 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> -#include <dirent.h> #include <proto/bullet.h> #include <proto/exec.h> @@ -182,6 +181,12 @@ char *strsep(char **s1, const char *s2) return p1; } +int alphasort(const struct dirent **d1, const struct dirent **d2) +{ + /*\todo stub function, needs writing, preferably into clib2 */ + return 0; +} + int scandir(const char *dir, struct dirent ***namelist, int (*filter)(const struct dirent *), int (*compar)(const struct dirent **, const struct dirent **)) diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h index fde032a..dc4e065 100644 --- a/frontends/amiga/os3support.h +++ b/frontends/amiga/os3support.h @@ -27,6 +27,7 @@ #ifndef __amigaos4__ #include <stdint.h> +#include <dirent.h> #include <proto/exec.h> #include <proto/dos.h> @@ -257,6 +258,10 @@ char *ASPrintf(const char *fmt, ...); /* C */ char *strlwr(char *str); +int alphasort(const struct dirent **d1, const struct dirent **d2); +int scandir(const char *dir, struct dirent ***namelist, + int (*filter)(const struct dirent *), + int (*compar)(const struct dirent **, const struct dirent **)); #endif #endif diff --git a/include/netsurf/plot_style.h b/include/netsurf/plot_style.h index fee7a10..6f2977f 100644 --- a/include/netsurf/plot_style.h +++ b/include/netsurf/plot_style.h @@ -214,7 +214,7 @@ static inline colour colour_engorge_component( bool dark, enum plot_colour_component comp) { - static const colour mask[PLOT_COLOUR_COMPONENT_ALPHA] = { + static const colour msk[PLOT_COLOUR_COMPONENT_ALPHA] = { [PLOT_COLOUR_COMPONENT_RED] = 0x0000ff, [PLOT_COLOUR_COMPONENT_GREEN] = 0x00ff00, [PLOT_COLOUR_COMPONENT_BLUE] = 0xff0000, @@ -224,7 +224,7 @@ static inline colour colour_engorge_component( assert(comp < PLOT_COLOUR_COMPONENT_ALPHA); - return (mask[comp] & l) | (~mask[comp] & d); + return (msk[comp] & l) | (~msk[comp] & d); } diff --git a/utils/file.c b/utils/file.c index 7eff6a7..c460e49 100644 --- a/utils/file.c +++ b/utils/file.c @@ -38,6 +38,10 @@ #include "utils/file.h" #include "utils/dirent.h" +#ifdef nsamiga +#include "frontends/amiga/os3support.h" +#endif + /** * Generate a posix path from one or more component elemnts. * -- NetSurf Browser