--- a/jdk/src/java.base/windows/native/libnet/net_util_md.c Tue Sep 09 17:20:26 2014 +0400
+++ b/jdk/src/java.base/windows/native/libnet/net_util_md.c Tue Sep 09 19:02:36 2014 +0400
@@ -627,7 +627,7 @@
* and returns SOCKET_ERROR. Used in NET_BindV6 only.
*/
-#define CLOSE_SOCKETS_AND_RETURN { \
+#define CLOSE_SOCKETS_AND_RETURN do { \
if (fd != -1) { \
closesocket (fd); \
fd = -1; \
@@ -646,7 +646,7 @@
} \
b->ipv4_fd = b->ipv6_fd = -1; \
return SOCKET_ERROR; \
-}
+} while(0)
/*
* if ipv6 is available, call NET_BindV6 to bind to the required address/port.