Hans Leidekker : wbemprox: Don't define USE_WS_PREFIX on MinGW.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d11a07ec7c4247ea8c3de78cc09aee8f2c7d7298
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d11a07ec7c4247ea8c3de78cc0...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Wed Feb  1 14:18:49 2017 +0100

wbemprox: Don't define USE_WS_PREFIX on MinGW.

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wbemprox/Makefile.in |  1 -
 dlls/wbemprox/builtin.c   | 13 +++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in
index e6dc995..f411898 100644
--- a/dlls/wbemprox/Makefile.in
+++ b/dlls/wbemprox/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DUSE_WS_PREFIX
 MODULE    = wbemprox.dll
 IMPORTS   = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4
 
diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c
index 14e819e..0976306 100644
--- a/dlls/wbemprox/builtin.c
+++ b/dlls/wbemprox/builtin.c
@@ -31,8 +31,17 @@
 #define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
-#include "winsock2.h"
-#include "ws2tcpip.h"
+#ifdef __MINGW32__
+# include "winsock2.h"
+# include "ws2tcpip.h"
+# define WS_AF_UNSPEC AF_UNSPEC
+# define WS_NI_MAXHOST NI_MAXHOST
+# define WS_NI_NAMEREQD NI_NAMEREQD
+#else
+# define USE_WS_PREFIX
+# include "winsock2.h"
+# include "ws2tcpip.h"
+#endif
 #include "initguid.h"
 #include "wbemcli.h"
 #include "wbemprov.h"