aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2011-01-19 23:13:54 +0100
committerJan Djärv2011-01-19 23:13:54 +0100
commit8beb828a0bf0ba523cdd99396d036ab4b3bfa464 (patch)
tree8d31abd3aab269ea30c51ef812568cde435bd440
parentfb9d0f5afc688e0225c173fa85fd0123467be59c (diff)
downloademacs-8beb828a0bf0ba523cdd99396d036ab4b3bfa464.tar.gz
emacs-8beb828a0bf0ba523cdd99396d036ab4b3bfa464.zip
* unexmacosx.c: Include config.h before unistd.h.
Fixes: debbugs:7859
-rw-r--r--src/ChangeLog2
-rw-r--r--src/unexmacosx.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2f8e7a7ceeb..79cc893eaae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-01-19 Jan Djärv <jan.h.d@swipnet.se> 12011-01-19 Jan Djärv <jan.h.d@swipnet.se>
2 2
3 * unexmacosx.c: Include config.h before unistd.h (Bug#7859).
4
3 * nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize) 5 * nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize)
4 (ns_input_line, ns_input_color, ns_input_text, ns_working_text) 6 (ns_input_line, ns_input_color, ns_input_text, ns_working_text)
5 (ns_input_spi_name, ns_input_spi_arg) 7 (ns_input_spi_name, ns_input_spi_arg)
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 75d6677f535..d3cf74eb33c 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -91,6 +91,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
91#include <fcntl.h> 91#include <fcntl.h>
92#include <stdarg.h> 92#include <stdarg.h>
93#include <sys/types.h> 93#include <sys/types.h>
94#include <config.h>
95#undef malloc
96#undef realloc
97#undef free
94#include <unistd.h> 98#include <unistd.h>
95#include <mach/mach.h> 99#include <mach/mach.h>
96#include <mach-o/loader.h> 100#include <mach-o/loader.h>
@@ -98,10 +102,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
98#if defined (__ppc__) 102#if defined (__ppc__)
99#include <mach-o/ppc/reloc.h> 103#include <mach-o/ppc/reloc.h>
100#endif 104#endif
101#include <config.h>
102#undef malloc
103#undef realloc
104#undef free
105#ifdef HAVE_MALLOC_MALLOC_H 105#ifdef HAVE_MALLOC_MALLOC_H
106#include <malloc/malloc.h> 106#include <malloc/malloc.h>
107#else 107#else