Author: bursa Date: Mon Jan 29 22:27:15 2007 New Revision: 3154 URL: http://svn.semichrome.net?rev=3154&view=rev Log: Make GTK build compile on FreeBSD. Modified: trunk/netsurf/content/content.c trunk/netsurf/content/fetch.c trunk/netsurf/content/fetch.h trunk/netsurf/content/fetchcache.c trunk/netsurf/content/urldb.c trunk/netsurf/css/makeenum trunk/netsurf/css/parser.y trunk/netsurf/css/ruleset.c trunk/netsurf/desktop/browser.c trunk/netsurf/gtk/gtk_gui.c trunk/netsurf/makefile trunk/netsurf/posix.mk trunk/netsurf/render/box_construct.c trunk/netsurf/render/directory.c trunk/netsurf/utils/filename.c trunk/netsurf/utils/talloc.h trunk/netsurf/utils/utils.c trunk/netsurf/utils/utils.h Modified: trunk/netsurf/content/content.c URL: http://svn.semichrome.net/trunk/netsurf/content/content.c?rev=3154&r1... ============================================================================== --- trunk/netsurf/content/content.c (original) +++ trunk/netsurf/content/content.c Mon Jan 29 22:27:15 2007 @@ -18,6 +18,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <strings.h> #include <time.h> #include "netsurf/utils/config.h" #include "netsurf/content/content.h" Modified: trunk/netsurf/content/fetch.c URL: http://svn.semichrome.net/trunk/netsurf/content/fetch.c?rev=3154&r1=3... ============================================================================== --- trunk/netsurf/content/fetch.c (original) +++ trunk/netsurf/content/fetch.c Mon Jan 29 22:27:15 2007 @@ -24,14 +24,15 @@ #include <string.h> #include <strings.h> #include <time.h> +#include <sys/select.h> #include <sys/stat.h> #ifdef riscos #include <unixlib/local.h> #endif -#include "curl/curl.h" +#include <curl/curl.h> #include "netsurf/utils/config.h" #ifdef WITH_SSL -#include "openssl/ssl.h" +#include <openssl/ssl.h> #endif #include "netsurf/content/fetch.h" #include "netsurf/content/urldb.h" Modified: trunk/netsurf/content/fetch.h URL: http://svn.semichrome.net/trunk/netsurf/content/fetch.h?rev=3154&r1=3... ============================================================================== --- trunk/netsurf/content/fetch.h (original) +++ trunk/netsurf/content/fetch.h Mon Jan 29 22:27:15 2007 @@ -13,7 +13,8 @@ #define _NETSURF_DESKTOP_FETCH_H_ #include <stdbool.h> -#include "curl/curl.h" +#include <sys/select.h> +#include <curl/curl.h> #include "netsurf/utils/config.h" typedef enum { Modified: trunk/netsurf/content/fetchcache.c URL: http://svn.semichrome.net/trunk/netsurf/content/fetchcache.c?rev=3154&... ============================================================================== --- trunk/netsurf/content/fetchcache.c (original) +++ trunk/netsurf/content/fetchcache.c Mon Jan 29 22:27:15 2007 @@ -16,6 +16,7 @@ #define _GNU_SOURCE /* for strndup */ #include <assert.h> #include <string.h> +#include <strings.h> #include <sys/types.h> #include <regex.h> #include <time.h> Modified: trunk/netsurf/content/urldb.c URL: http://svn.semichrome.net/trunk/netsurf/content/urldb.c?rev=3154&r1=3... ============================================================================== --- trunk/netsurf/content/urldb.c (original) +++ trunk/netsurf/content/urldb.c Mon Jan 29 22:27:15 2007 @@ -76,8 +76,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <strings.h> #include <time.h> +#include <sys/select.h> #include <curl/curl.h> #include "netsurf/image/bitmap.h" Modified: trunk/netsurf/css/makeenum URL: http://svn.semichrome.net/trunk/netsurf/css/makeenum?rev=3154&r1=3153... ============================================================================== --- trunk/netsurf/css/makeenum (original) +++ trunk/netsurf/css/makeenum Mon Jan 29 22:27:15 2007 @@ -11,7 +11,7 @@ open H, ">$out.h" or die "open 'enum.h' failed"; open C, ">$out.c" or die "open 'enum.c' failed"; -print C "#include <string.h>\n"; +print C "#include <strings.h>\n"; print C "#include \"$out.h\"\n\n"; while (<>) { Modified: trunk/netsurf/css/parser.y URL: http://svn.semichrome.net/trunk/netsurf/css/parser.y?rev=3154&r1=3153... ============================================================================== --- trunk/netsurf/css/parser.y (original) +++ trunk/netsurf/css/parser.y Mon Jan 29 22:27:15 2007 @@ -398,7 +398,7 @@ %extra_argument { struct css_parser_params *param } %include { -#include <string.h> +#include <strings.h> #define CSS_INTERNALS #include "netsurf/css/css.h" #include "netsurf/utils/utils.h" } Modified: trunk/netsurf/css/ruleset.c URL: http://svn.semichrome.net/trunk/netsurf/css/ruleset.c?rev=3154&r1=315... ============================================================================== --- trunk/netsurf/css/ruleset.c (original) +++ trunk/netsurf/css/ruleset.c Mon Jan 29 22:27:15 2007 @@ -23,6 +23,7 @@ #include <stdbool.h> #include <stdlib.h> #include <string.h> +#include <strings.h> #define CSS_INTERNALS #define NDEBUG #include "netsurf/css/css.h" Modified: trunk/netsurf/desktop/browser.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/browser.c?rev=3154&r1... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Mon Jan 29 22:27:15 2007 @@ -20,6 +20,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> +#include <sys/select.h> #include "curl/curl.h" #include "netsurf/utils/config.h" #include "netsurf/content/fetch.h" Modified: trunk/netsurf/gtk/gtk_gui.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_gui.c?rev=3154&r1=315... ============================================================================== --- trunk/netsurf/gtk/gtk_gui.c (original) +++ trunk/netsurf/gtk/gtk_gui.c Mon Jan 29 22:27:15 2007 @@ -13,6 +13,7 @@ #include <string.h> #include <unistd.h> #include <limits.h> +#include <sys/select.h> #include <sys/stat.h> #include <sys/types.h> #include <curl/curl.h> Modified: trunk/netsurf/makefile URL: http://svn.semichrome.net/trunk/netsurf/makefile?rev=3154&r1=3153&... ============================================================================== --- trunk/netsurf/makefile (original) +++ trunk/netsurf/makefile Mon Jan 29 22:27:15 2007 @@ -94,7 +94,7 @@ OBJS_DEBUGRO=$(OBJECTS_DEBUGRO:%.o=$(OBJDIR_RISCOS)/%.o) -OBJDIR_GTK = $(shell $(SYSTEM_CC) -dumpmachine)-gtk +OBJDIR_GTK = objects-gtk SOURCES_GTK=$(OBJECTS_GTK:.o=.c) OBJS_GTK=$(OBJECTS_GTK:%.o=$(OBJDIR_GTK)/%.o) @@ -129,7 +129,7 @@ CFLAGS_NCOS = $(CFLAGS_RISCOS) -Dncos CFLAGS_DEBUG = -std=c9x -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I.. \ $(PLATFORM_CFLAGS_DEBUG) -g -CFLAGS_GTK = -Dnsgtk -std=c9x -D_BSD_SOURCE -D_POSIX_C_SOURCE -Dgtk \ +CFLAGS_GTK = -Dnsgtk -std=c9x -D_BSD_SOURCE -Dgtk \ $(WARNFLAGS) -I.. -g -O0 -Wformat=2 -DNDEBUG \ `pkg-config --cflags libglade-2.0 gtk+-2.0` `xml2-config --cflags` Modified: trunk/netsurf/posix.mk URL: http://svn.semichrome.net/trunk/netsurf/posix.mk?rev=3154&r1=3153&... ============================================================================== --- trunk/netsurf/posix.mk (original) +++ trunk/netsurf/posix.mk Mon Jan 29 22:27:15 2007 @@ -10,14 +10,14 @@ -I$(GCCSDK_INSTALL_ENV)/include/libmng \ #-finstrument-functions PLATFORM_CFLAGS_DEBUG = -I/usr/include/libxml2 -I/riscos/src/OSLib \ - -I/riscos/include/libjpeg -D_POSIX_C_SOURCE + -I/riscos/include/libjpeg -D_POSIX_C_SOURCE=200112 PLATFORM_AFLAGS_RISCOS = -I$(GCCSDK_INSTALL_ENV)/include LDFLAGS_RISCOS = -L$(GCCSDK_INSTALL_ENV)/lib -lxml2 -lz -lcurl -lssl -lcrypto \ -lcares -lmng -lOSLib32 -ljpeg -lrufl -lpencil #-lprof LDFLAGS_SMALL = -L$(GCCSDK_INSTALL_ENV)/lib -lxml2 -lz -lucurl \ -lcares -lmng -lOSLib32 -ljpeg -lrufl -lpencil -LDFLAGS_DEBUG = -L/usr/lib -lxml2 -lz -lm -lcurl -lssl -lcrypto -ldl -lmng \ +LDFLAGS_DEBUG = -L/usr/lib -lxml2 -lz -lm -lcurl -lssl -lcrypto -lmng \ -ljpeg -llcms # Hackery for Cygwin - it has no libdl, so remove it from LDFLAGS Modified: trunk/netsurf/render/box_construct.c URL: http://svn.semichrome.net/trunk/netsurf/render/box_construct.c?rev=3154&a... ============================================================================== --- trunk/netsurf/render/box_construct.c (original) +++ trunk/netsurf/render/box_construct.c Mon Jan 29 22:27:15 2007 @@ -19,6 +19,7 @@ #include <stdbool.h> #include <stdlib.h> #include <string.h> +#include <strings.h> #include "libxml/HTMLparser.h" #include "libxml/parserInternals.h" #include "netsurf/utils/config.h" Modified: trunk/netsurf/render/directory.c URL: http://svn.semichrome.net/trunk/netsurf/render/directory.c?rev=3154&r... ============================================================================== --- trunk/netsurf/render/directory.c (original) +++ trunk/netsurf/render/directory.c Mon Jan 29 22:27:15 2007 @@ -101,8 +101,8 @@ return false; } while ((entry = readdir(parent)) != NULL) { - if ((entry->d_ino == 0) || (!strcmp(entry->d_name, ".")) || - (!strcmp(entry->d_name, ".."))) + if (!strcmp(entry->d_name, ".") || + !strcmp(entry->d_name, "..")) continue; snprintf(buffer, sizeof(buffer), "<a href=\"%s/%s\">%s</a>\n", Modified: trunk/netsurf/utils/filename.c URL: http://svn.semichrome.net/trunk/netsurf/utils/filename.c?rev=3154&r1=... ============================================================================== --- trunk/netsurf/utils/filename.c (original) +++ trunk/netsurf/utils/filename.c Mon Jan 29 22:27:15 2007 @@ -216,8 +216,8 @@ parent = opendir(folder); while ((entry = readdir(parent))) { - if ((entry->d_ino == 0) || (!strcmp(entry->d_name, ".")) || - (!strcmp(entry->d_name, ".."))) + if (!strcmp(entry->d_name, ".") || + !strcmp(entry->d_name, "..")) continue; /* first 3 depths are directories only, then files only */ Modified: trunk/netsurf/utils/talloc.h URL: http://svn.semichrome.net/trunk/netsurf/utils/talloc.h?rev=3154&r1=31... ============================================================================== --- trunk/netsurf/utils/talloc.h (original) +++ trunk/netsurf/utils/talloc.h Mon Jan 29 22:27:15 2007 @@ -20,6 +20,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#include <unistd.h> /* this is only needed for compatibility with the old talloc */ typedef void TALLOC_CTX; Modified: trunk/netsurf/utils/utils.c URL: http://svn.semichrome.net/trunk/netsurf/utils/utils.c?rev=3154&r1=315... ============================================================================== --- trunk/netsurf/utils/utils.c (original) +++ trunk/netsurf/utils/utils.c Mon Jan 29 22:27:15 2007 @@ -2,7 +2,7 @@ * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license - * Copyright 2004 James Bursa <bursa(a)users.sourceforge.net&gt; + * Copyright 2004-2007 James Bursa <bursa(a)users.sourceforge.net&gt; * Copyright 2003 Phil Mellor <monkeyson(a)users.sourceforge.net&gt; * Copyright 2003 John M Bell <jmb202(a)ecs.soton.ac.uk&gt; * Copyright 2004 John Tytgat <John.Tytgat(a)aaug.net&gt; @@ -235,3 +235,30 @@ return NULL; } + + +#ifdef __FreeBSD__ + +/** + * Duplicate up to n characters of a string. + */ + +char *strndup(const char *s, size_t n) +{ + size_t len; + char *s2; + + for (len = 0; len != n && s[len]; len++) + continue; + + s2 = malloc(len + 1); + if (!s2) + return 0; + + memcpy(s2, s, len); + s2[len] = 0; + return s2; +} + +#endif + Modified: trunk/netsurf/utils/utils.h URL: http://svn.semichrome.net/trunk/netsurf/utils/utils.h?rev=3154&r1=315... ============================================================================== --- trunk/netsurf/utils/utils.h (original) +++ trunk/netsurf/utils/utils.h Mon Jan 29 22:27:15 2007 @@ -2,7 +2,7 @@ * This file is part of NetSurf, http://netsurf-browser.org/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license - * Copyright 2004 James Bursa <bursa(a)users.sourceforge.net&gt; + * Copyright 2004-2007 James Bursa <bursa(a)users.sourceforge.net&gt; * Copyright 2004 John Tytgat <John.Tytgat(a)aaug.net&gt; */ @@ -56,6 +56,10 @@ char *human_friendly_bytesize(unsigned long bytesize); const char *rfc1123_date(time_t t); char *strcasestr(const char *haystack, const char *needle); +#ifdef __FreeBSD__ +/* FreeBSD lacks strndup */ +char *strndup(const char *s, size_t n); +#endif /* Platform specific functions */ void die(const char * const error);