summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-03-06 18:52:32 +0200
committerEli Zaretskii <eliz@gnu.org>2016-03-06 18:52:32 +0200
commit69e03ddccf47fc29126317dd3317313ecd92b797 (patch)
treea66994a957254c4f14fb43d46794444aba05b602 /nt
parent20cc4182598c6c724f4556faf6bc322c9e58ad1d (diff)
downloademacs-69e03ddccf47fc29126317dd3317313ecd92b797.tar.gz
Unbreak the MinGW64 build
* nt/inc/ms-w32.h [MINGW_W64]: Undefine HAVE_GAI_STRERROR. See http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg00130.html for the details. Reported by Angelo Graziosi <angelo.graziosi@alice.it>.
Diffstat (limited to 'nt')
-rw-r--r--nt/inc/ms-w32.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index a37510e7457..9de3b12a808 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -185,6 +185,13 @@ extern struct tm * sys_localtime (const time_t *);
supply the 2nd arg correctly, so don't use _setjmp directly in that
case. */
#undef HAVE__SETJMP
+
+/* Unlike MS and mingw.org, MinGW64 doesn't define gai_strerror as an
+ inline function in a system header file, and instead seems to
+ require to link against ws2_32.a. But we don't want to link with
+ -lws2_32, as that would make Emacs dependent on the respective DLL.
+ So MinGW64 is amply punished here by the following: */
+#undef HAVE_GAI_STRERROR
#endif
/* The following is needed for recovery from C stack overflows. */