Index: render/textplain.c =================================================================== --- render/textplain.c (revision 4481) +++ render/textplain.c (working copy) @@ -24,7 +24,10 @@ #include #include #include +#include +#ifndef __APPLE__ #define LIBICONV_PLUG +#endif #include #include "content/content.h" #include "css/css.h" Index: render/list.c =================================================================== --- render/list.c (revision 4481) +++ render/list.c (working copy) @@ -23,6 +23,7 @@ #include #include #include +#include #include "css/css.h" #include "render/list.h" #include "utils/log.h" Index: render/imagemap.c =================================================================== --- render/imagemap.c (revision 4481) +++ render/imagemap.c (working copy) @@ -23,6 +23,7 @@ #include #include #include +#include #include "content/content.h" #include "render/box.h" #include "render/imagemap.h" Index: image/mng.c =================================================================== --- image/mng.c (revision 4481) +++ image/mng.c (working copy) @@ -383,9 +383,10 @@ static bool start = true; static time_t t0; struct timeval tv; -#if defined(__SVR4) && defined(__sun) || defined(__NetBSD__) - /* Solaris and NetBSD don't have this structure, and ignores the second - * parameter to gettimeofday() +#if defined(__SVR4) && defined(__sun) || defined(__NetBSD__) || \ + defined(__APPLE__) + /* Solaris, NetBSD, and OS X don't have this structure, and ignore the + * second parameter to gettimeofday() */ int tz; #else Index: utils/utils.c =================================================================== --- utils/utils.c (revision 4481) +++ utils/utils.c (working copy) @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include Index: utils/hashtable.h =================================================================== --- utils/hashtable.h (revision 4481) +++ utils/hashtable.h (working copy) @@ -30,7 +30,7 @@ void hash_destroy(struct hash_table *ht); bool hash_add(struct hash_table *ht, const char *key, const char *value); const char *hash_get(struct hash_table *ht, const char *key); -inline unsigned int hash_string_fnv(const char *datum, unsigned int *len); +unsigned int hash_string_fnv(const char *datum, unsigned int *len); const char *hash_iterate(struct hash_table *ht, unsigned int *c1, unsigned int **c2); Index: utils/config.h =================================================================== --- utils/config.h (revision 4481) +++ utils/config.h (working copy) @@ -24,7 +24,8 @@ /* Try to detect which features the target OS supports */ #define HAVE_STRNDUP -#if defined(__FreeBSD__) || (defined(__SRV4) && defined(__sun)) +#if defined(__FreeBSD__) || (defined(__SRV4) && defined(__sun)) || \ + defined(__APPLE__) /* FreeBSD and Solaris do not have this function, so * we implement it ourselves in util.c */ @@ -75,7 +76,7 @@ #else /* We're likely to have a working mmap() */ #define WITH_MMAP - #define WITH_NSSPRITE + #undef WITH_NSSPRITE #if !defined(DEBUG_BUILD) /* Use librsvg and Cairo for rendering SVG */ #define WITH_RSVG Index: utils/utf8.c =================================================================== --- utils/utf8.c (revision 4481) +++ utils/utf8.c (working copy) @@ -25,9 +25,13 @@ #include #include #include +#include +#ifndef __APPLE__ #define LIBICONV_PLUG +#endif #include +#include "utils/config.h" #include "utils/log.h" #include "utils/utf8.h" Index: desktop/browser.c =================================================================== --- desktop/browser.c (revision 4481) +++ desktop/browser.c (working copy) @@ -31,6 +31,7 @@ #include #include #include +#include #include #include "curl/curl.h" #include "utils/config.h" Index: desktop/options.c =================================================================== --- desktop/options.c (revision 4481) +++ desktop/options.c (working copy) @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include "content/urldb.h" Index: Makefile =================================================================== --- Makefile (revision 4481) +++ Makefile (working copy) @@ -167,10 +167,9 @@ -D_NETBSD_SOURCE \ $(WARNFLAGS) -I. -I../../libsprite/trunk/ -g $(OPT2FLAGS) \ $(shell $(PKG_CONFIG) --cflags libglade-2.0 gtk+-2.0 librsvg-2.0) \ - $(shell $(PKG_CONFIG) --cflags librosprite) \ $(shell xml2-config --cflags) -GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs libglade-2.0 gtk+-2.0 gthread-2.0 gmodule-2.0 librsvg-2.0 librosprite) +GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs libglade-2.0 gtk+-2.0 gthread-2.0 gmodule-2.0 librsvg-2.0) CFLAGS += $(GTKCFLAGS) LDFLAGS += $(GTKLDFLAGS) $(shell $(PKG_CONFIG) --libs lcms) @@ -259,9 +258,7 @@ -D_POSIX_C_SOURCE=200112L \ -D_NETBSD_SOURCE \ $(WARNFLAGS) -I. -I../../libsprite/trunk/ -g $(OPT0FLAGS) \ - $(shell $(PKG_CONFIG) --cflags librosprite) \ $(shell xml2-config --cflags) -LDFLAGS += $(shell $(PKG_CONFIG) --libs librosprite) endif $(OBJROOT)/created: