Mercurial > emacs
changeset 97451:8662a1d13e79
Undefine HAVE_RES_INIT, which appears to be harmful on OS X.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 14 Aug 2008 00:51:41 +0000 |
| parents | e3dbd401e0f4 |
| children | 427a89824369 |
| files | src/s/darwin.h |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/s/darwin.h Thu Aug 14 00:51:20 2008 +0000 +++ b/src/s/darwin.h Thu Aug 14 00:51:41 2008 +0000 @@ -154,17 +154,20 @@ /* Definitions for how to compile & link. */ #ifdef HAVE_NS -/* XXX: lresolv is here because configure when testing #undefs res_init, - a macro in /usr/include/resolv.h for res_9_init, not in stdc lib. */ -#define LIBS_NSGUI -framework AppKit -lresolv +#define LIBS_NSGUI -framework AppKit #define SYSTEM_PURESIZE_EXTRA 200000 #define HEADERPAD_EXTRA 6C8 - #else /* !HAVE_NS */ #define LIBS_NSGUI #define HEADERPAD_EXTRA 690 #endif /* !HAVE_NS */ +/* On Darwin, res_init appears not to be useful: see bug#562 and + http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01467.html */ + +#undef HAVE_RES_INIT +#undef HAVE_LIBRESOLV + /* The -headerpad option tells ld (see man page) to leave room at the end of the header for adding load commands. Needed for dumping. 0x690 is the total size of 30 segment load commands (at 56