ws2_32: Only declare IPX support if the required definitions are found

Bruno Jesus 00cpxxx at gmail.com
Wed Jul 2 23:01:53 CDT 2014


Some libraries like musl libc do not have netipx/ipx.h, when that
happens wine includes some other files hoping that SO_DEFAULT_HEADERS
will be defined. But that is only availabe in BSD. So ensure SOL_IPX
or SO_DEFAULT_HEADERS is defined before defining HAS_IPX.
-------------- next part --------------
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index e1d0ce5..0e738f1 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -100,7 +100,6 @@
 
 #ifdef HAVE_NETIPX_IPX_H
 # include <netipx/ipx.h>
-# define HAS_IPX
 #elif defined(HAVE_LINUX_IPX_H)
 # ifdef HAVE_ASM_TYPES_H
 #  include <asm/types.h>
@@ -109,6 +108,8 @@
 #  include <linux/types.h>
 # endif
 # include <linux/ipx.h>
+#endif
+#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS)
 # define HAS_IPX
 #endif
 


More information about the wine-patches mailing list