From 3163913473b324d92775aa886ab28320ac589b59 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Mon, 24 May 2010 01:13:52 +0000
Subject: [PATCH] Resolve MSVC10 warnings about error macro redefinitions.

---
 src/xpdev/sockwrap.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/xpdev/sockwrap.h b/src/xpdev/sockwrap.h
index 08ac020e9d..f94ee97b64 100644
--- a/src/xpdev/sockwrap.h
+++ b/src/xpdev/sockwrap.h
@@ -98,13 +98,27 @@ typedef struct {
 #undef  EWOULDBLOCK
 #define EWOULDBLOCK		(WSAEWOULDBLOCK-WSABASEERR)
 
+#ifndef EPROTOTYPE
 #define EPROTOTYPE		(WSAEPROTOTYPE-WSABASEERR)
+#endif
+#ifndef ENOPROTOOPT
 #define ENOPROTOOPT		(WSAENOPROTOOPT-WSABASEERR)
+#endif
+#ifndef EPROTONOSUPPORT
 #define EPROTONOSUPPORT	(WSAEPROTONOSUPPORT-WSABASEERR)
+#endif
+#ifndef ESOCKTNOSUPPORT
 #define ESOCKTNOSUPPORT	(WSAESOCKTNOSUPPORT-WSABASEERR)
+#endif
+#ifndef EOPNOTSUPP
 #define EOPNOTSUPP		(WSAEOPNOTSUPP-WSABASEERR)
+#endif
+#ifndef EPFNOSUPPORT
 #define EPFNOSUPPORT	(WSAEPFNOSUPPORT-WSABASEERR)
+#endif
+#ifndef EAFNOSUPPORT
 #define EAFNOSUPPORT	(WSAEAFNOSUPPORT-WSABASEERR)
+#endif
 
 #undef  EADDRINUSE
 #define EADDRINUSE		(WSAEADDRINUSE-WSABASEERR)
-- 
GitLab