Merge branch 'master' into jgrpp

2019-10-12 00:45:01 +01:00
parent 29ed470e04 e2e112baaa
commit 03fbe87752
11 changed files with 107 additions and 18 deletions
--- a/src/network/core/os_abstraction.h
+++ b/src/network/core/os_abstraction.h
@@ -31,6 +31,11 @@
 /* Windows has some different names for some types */
 typedef unsigned long in_addr_t;

+/* Handle cross-compilation with --build=*-*-cygwin --host=*-*-mingw32 */
+#if defined(__MINGW32__) && !defined(AI_ADDRCONFIG)
+#	define AI_ADDRCONFIG               0x00000400
+#endif
+
 #if !(defined(__MINGW32__) || defined(__CYGWIN__))
 	/* Windows has some different names for some types */
 	typedef SSIZE_T ssize_t;