[Emacs-diffs] /srv/bzr/emacs/trunk r102905: * unexmacosx.c: Include config.h before unistd.h.

[Jan D.]

------------------------------------------------------------
revno: 102905
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Wed 2011-01-19 23:13:54 +0100
message:
  * unexmacosx.c: Include config.h before unistd.h.
modified:
  src/ChangeLog
  src/unexmacosx.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-19 22:11:33 +0000
+++ b/src/ChangeLog     2011-01-19 22:13:54 +0000
@@ -1,5 +1,7 @@
 2011-01-19  Jan Djärv  <address@hidden>
 
+       * 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)

=== modified file 'src/unexmacosx.c'
--- a/src/unexmacosx.c  2011-01-15 23:16:57 +0000
+++ b/src/unexmacosx.c  2011-01-19 22:13:54 +0000
@@ -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