Make nsgtk compile on Mac OS X.

svn path=/trunk/netsurf/; revision=5031

Makefile

@@ -60,12 +60,6 @@ else
     # Haiku implements the BeOS API
     HOST := beos
   endif
-  ifeq ($(HOST),AmigaOS)
-    HOST := amiga
-    ifeq ($(TARGET),)
-      TARGET := amiga
-    endif
-  endif
   ifeq ($(HOST),beos)
     # Build happening on BeOS platform, default target is BeOS backend
     ifeq ($(TARGET),)
@@ -74,9 +68,21 @@ else
     # BeOS still uses gcc2
     GCCVER := 2
   else
-    # Build happening on non-RO platform, default target is GTK backend
-    ifeq ($(TARGET),)
-      TARGET := gtk
+    ifeq ($(HOST),AmigaOS)
+      HOST := amiga
+      ifeq ($(TARGET),)
+        TARGET := amiga
+      endif
+      GCCVER := 2
+    else
+      ifeq ($(HOST),Darwin)
+        HOST := macosx
+      endif
+
+      # Default target is GTK backend
+      ifeq ($(TARGET),)
+        TARGET := gtk
+      endif
     endif
   endif
 endif

Makefile.config

@@ -26,7 +26,7 @@ NETSURF_USE_JPEG := YES
 NETSURF_USE_MNG := YES
 
 # Use libharu to enable PDF export and GTK printing support.  There is no
-# auto-detection available for this, as it does not have a pkg-config file
+# auto-detection available for this, as it does not have a pkg-config file.
 # Valid options: YES, NO
 NETSURF_USE_HARU_PDF := YES
 
@@ -103,6 +103,11 @@ ifeq ($(TARGET),gtk)
   # Valid options: YES, NO, AUTO
   NETSURF_USE_ROSPRITE := AUTO
 
+  # Configuration overrides for Mac OS X
+  ifeq ($(HOST),macosx)
+    NETSURF_USE_LIBICONV_PLUG := NO
+    NETSURF_USE_HARU_PDF := NO
+  endif
 endif
 
 # ----------------------------------------------------------------------------

desktop/browser.c

@@ -31,6 +31,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <math.h>
 #include <sys/select.h>
 #include "curl/curl.h"

desktop/options.c

@@ -30,6 +30,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <libxml/HTMLparser.h>
 #include <libxml/HTMLtree.h>
 #include "content/urldb.h"

image/mng.c

@@ -383,9 +383,10 @@ mng_uint32 nsmng_gettickcount(mng_handle mng) {
 	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

render/imagemap.c

@@ -23,6 +23,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <string.h>
+#include <strings.h>
 #include "content/content.h"
 #include "render/box.h"
 #include "render/imagemap.h"

render/list.c

@@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "css/css.h"
 #include "render/list.h"
 #include "utils/log.h"

render/textplain.c

@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
+#include <strings.h>
 #include <math.h>
 #include <iconv.h>
 #include "content/content.h"

utils/config.h

@@ -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
 	 */

utils/utf8.c

@@ -25,8 +25,10 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <iconv.h>
 
+#include "utils/config.h"
 #include "utils/log.h"
 #include "utils/utf8.h"
 

utils/utils.c

@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/time.h>

utils/utils.h

@@ -75,7 +75,8 @@ void regcomp_wrapper(regex_t *preg, const char *regex, int cflags);
 void unicode_transliterate(unsigned int c, char **r);
 char *human_friendly_bytesize(unsigned long bytesize);
 const char *rfc1123_date(time_t t);
-#if !(defined(_GNU_SOURCE) || defined(__NetBSD__)) || defined(riscos)
+#if !(defined(_GNU_SOURCE) || defined(__NetBSD__)) || defined(riscos) || \
+	defined(__APPLE__)
 char *strcasestr(const char *haystack, const char *needle);
 #endif
 unsigned int wallclock(void);