From: Martin Willi <martin@revosec.ch>
Date: Tue, 29 Oct 2013 09:48:09 +0000 (+0100)
Subject: windows: Don't use function macros to overload send/recv() and friends
X-Git-Tag: 5.2.0dr6~24^2~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ff171602958c614d14547b6be71e5b5d34866bb;p=thirdparty%2Fstrongswan.git

windows: Don't use function macros to overload send/recv() and friends

While the macro versions would not catch non-function invocations, we actually
have to use catch all to support the sender_t.send() function.
---

diff --git a/src/libstrongswan/utils/windows.h b/src/libstrongswan/utils/windows.h
index 4e1e6b6c26..d57b5dc1d3 100644
--- a/src/libstrongswan/utils/windows.h
+++ b/src/libstrongswan/utils/windows.h
@@ -267,26 +267,26 @@ int socketpair(int domain, int type, int protocol, int sv[2]);
 /**
  * recv(2) with support for MSG_DONTWAIT
  */
-#define recv(...) windows_recv(__VA_ARGS__)
+#define recv windows_recv
 ssize_t windows_recv(int sockfd, void *buf, size_t len, int flags);
 
 /**
  * recvfrom(2) with support for MSG_DONTWAIT
  */
-#define recvfrom(...) windows_recvfrom(__VA_ARGS__)
+#define recvfrom windows_recvfrom
 ssize_t windows_recvfrom(int sockfd, void *buf, size_t len, int flags,
 						 struct sockaddr *src_addr, socklen_t *addrlen);
 
 /**
  * recvfrom(2) with support for MSG_DONTWAIT
  */
-#define send(...) windows_send(__VA_ARGS__)
+#define send windows_send
 ssize_t windows_send(int sockfd, const void *buf, size_t len, int flags);
 
 /**
  * recvfrom(2) with support for MSG_DONTWAIT
  */
-#define sendto(...) windows_send(__VA_ARGS__)
+#define sendto windows_send
 ssize_t windows_sendto(int sockfd, const void *buf, size_t len, int flags,
 					   const struct sockaddr *dest_addr, socklen_t addrlen);