wininet & winhttp: Remove the MSG_WAITALL definition as it is not needed. (try 3)
Francois Gouget
fgouget at free.fr
Fri Dec 12 03:30:09 CST 2008
With MinGW we get Wine's definition and with MSVC we get the PSDK's
definition (if it is recent enough).
---
* When using the Wine headers, MSG_WAITALL is defined in winsock2.h
(which is included by ws2tcpip.h).
* When compiling with MinGW we use the Wine headers too so there is no
issue (I checked and that part compiled fine, but compilation failed
due to POLLIN & co).
* When compiling with MSVC, MSG_WAITALL is defined in any recent PSDK
so there is no isue either.
So we don't need to define MSG_WAITALL at all in our private headers.
dlls/winhttp/winhttp_private.h | 3 ---
dlls/wininet/internet.h | 6 +-----
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index b564d4f..5043235 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -34,9 +34,6 @@
#endif
#if defined(__MINGW32__) || defined (_MSC_VER)
# include <ws2tcpip.h>
-# ifndef MSG_WAITALL
-# define MSG_WAITALL 0
-# endif
#else
# define closesocket close
# define ioctlsocket ioctl
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index d8da781..8de85ff 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -42,11 +42,7 @@
# include <sys/socket.h>
#endif
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#ifndef MSG_WAITALL
-#define MSG_WAITALL 0
-#endif
-#else
+#if !defined(__MINGW32__) && !defined(_MSC_VER)
#define closesocket close
#define ioctlsocket ioctl
#endif /* __MINGW32__ */
--
1.5.6.5
More information about the wine-patches
mailing list