[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 69e03dd: Unbreak the MinGW64 build
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 69e03dd: Unbreak the MinGW64 build |
Date: |
Sun, 06 Mar 2016 16:53:13 +0000 |
branch: master
commit 69e03ddccf47fc29126317dd3317313ecd92b797
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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
<address@hidden>.
---
nt/inc/ms-w32.h | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index a37510e..9de3b12 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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 69e03dd: Unbreak the MinGW64 build,
Eli Zaretskii <=