Mercurial > emacs
changeset 112385:5bc690b4522f
* src/unexmacosx.c: Add comment about include order.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 20 Jan 2011 07:43:04 +0100 |
| parents | f5af01a13248 |
| children | 4ce9a7be0488 |
| files | src/ChangeLog src/unexmacosx.c |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jan 19 22:40:36 2011 -0800 +++ b/src/ChangeLog Thu Jan 20 07:43:04 2011 +0100 @@ -1,3 +1,7 @@ +2011-01-20 Jan Djärv <jan.h.d@swipnet.se> + + * unexmacosx.c: Add comment about include order. + 2011-01-20 Glenn Morris <rgm@gnu.org> * minibuf.c (syms_of_minibuf) <read-expression-history>:
--- a/src/unexmacosx.c Wed Jan 19 22:40:36 2011 -0800 +++ b/src/unexmacosx.c Thu Jan 20 07:43:04 2011 +0100 @@ -86,15 +86,20 @@ be changed accordingly. */ -#include <stdio.h> +/* config.h #define:s malloc/realloc/free and then includes stdlib.h. + We want the undefined versions, but if config.h includes stdlib.h + with the #define:s in place, the prototypes will be wrong and we get + warnings. To prevent that, include stdlib.h before config.h. */ + #include <stdlib.h> -#include <fcntl.h> -#include <stdarg.h> -#include <sys/types.h> #include <config.h> #undef malloc #undef realloc #undef free +#include <stdio.h> +#include <fcntl.h> +#include <stdarg.h> +#include <sys/types.h> #include <unistd.h> #include <mach/mach.h> #include <mach-o/loader.h>