Mercurial > emacs
changeset 112371:1a3d4c7ba327
* unexmacosx.c: Include config.h before unistd.h.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Wed, 19 Jan 2011 23:13:54 +0100 |
| parents | 7935463f385e |
| children | 539ff9c0e704 |
| files | src/ChangeLog src/unexmacosx.c |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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