diff options
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/unexmacosx.c | 8 |
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 @@ 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 --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/>. */ #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 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 |