# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1295475234 -3600
# Node ID 1a3d4c7ba3274dcd6c546f1e4d91980179247441
# Parent  7935463f385eefea5ee08cf73c3ba568d44af210
* unexmacosx.c: Include config.h before unistd.h.

diff -r 7935463f385e -r 1a3d4c7ba327 src/ChangeLog
--- a/src/ChangeLog	Wed Jan 19 23:11:33 2011 +0100
+++ b/src/ChangeLog	Wed Jan 19 23:13:54 2011 +0100
@@ -1,5 +1,7 @@
 2011-01-19  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* unexmacosx.c: Include config.h before unistd.h (Bug#7859).
+
 	* nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize)
 	(ns_input_line, ns_input_color, ns_input_text, ns_working_text)
 	(ns_input_spi_name, ns_input_spi_arg)
diff -r 7935463f385e -r 1a3d4c7ba327 src/unexmacosx.c
--- a/src/unexmacosx.c	Wed Jan 19 23:11:33 2011 +0100
+++ b/src/unexmacosx.c	Wed Jan 19 23:13:54 2011 +0100
@@ -91,6 +91,10 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include <sys/types.h>
+#include <config.h>
+#undef malloc
+#undef realloc
+#undef free
 #include <unistd.h>
 #include <mach/mach.h>
 #include <mach-o/loader.h>
@@ -98,10 +102,6 @@
 #if defined (__ppc__)
 #include <mach-o/ppc/reloc.h>
 #endif
-#include <config.h>
-#undef malloc
-#undef realloc
-#undef free
 #ifdef HAVE_MALLOC_MALLOC_H
 #include <malloc/malloc.h>
 #else