aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2008-08-14 00:51:41 +0000
committerChong Yidong2008-08-14 00:51:41 +0000
commit2a10213c123b477d34e90a6757b431d80b5f4791 (patch)
treec99a0f2ee3deb8140f00726ddc980c840a272437 /src
parent23c6bdbe4c4e51e700d9c2abab7a43241df8d4d4 (diff)
downloademacs-2a10213c123b477d34e90a6757b431d80b5f4791.tar.gz
emacs-2a10213c123b477d34e90a6757b431d80b5f4791.zip
Undefine HAVE_RES_INIT, which appears to be harmful on OS X.
Diffstat (limited to 'src')
-rw-r--r--src/s/darwin.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 068531df146..1aefb6bbf09 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -154,17 +154,20 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
154/* Definitions for how to compile & link. */ 154/* Definitions for how to compile & link. */
155 155
156#ifdef HAVE_NS 156#ifdef HAVE_NS
157/* XXX: lresolv is here because configure when testing #undefs res_init, 157#define LIBS_NSGUI -framework AppKit
158 a macro in /usr/include/resolv.h for res_9_init, not in stdc lib. */
159#define LIBS_NSGUI -framework AppKit -lresolv
160#define SYSTEM_PURESIZE_EXTRA 200000 158#define SYSTEM_PURESIZE_EXTRA 200000
161#define HEADERPAD_EXTRA 6C8 159#define HEADERPAD_EXTRA 6C8
162
163#else /* !HAVE_NS */ 160#else /* !HAVE_NS */
164#define LIBS_NSGUI 161#define LIBS_NSGUI
165#define HEADERPAD_EXTRA 690 162#define HEADERPAD_EXTRA 690
166#endif /* !HAVE_NS */ 163#endif /* !HAVE_NS */
167 164
165/* On Darwin, res_init appears not to be useful: see bug#562 and
166 http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01467.html */
167
168#undef HAVE_RES_INIT
169#undef HAVE_LIBRESOLV
170
168/* The -headerpad option tells ld (see man page) to leave room at the 171/* The -headerpad option tells ld (see man page) to leave room at the
169 end of the header for adding load commands. Needed for dumping. 172 end of the header for adding load commands. Needed for dumping.
170 0x690 is the total size of 30 segment load commands (at 56 173 0x690 is the total size of 30 segment load commands (at 56