From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Sat, 14 Jun 2008 08:36:07 +0000 (+0000)
Subject: on windows, r64214 broke compilation with some recent SDKs,
X-Git-Tag: v2.6b1~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d25cdc370d2469c37a780cf032ebcc86c41b3280;p=thirdparty%2FPython%2Fcpython.git

on windows, r64214 broke compilation with some recent SDKs,
because IPPROTO_IPV6 may be an enumeration member...
---

diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index 44483cb35b5a..ef8d0fca8eda 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -17,9 +17,10 @@
 # include <ws2tcpip.h>
 /* VC6 is shipped with old platform headers, and does not have MSTcpIP.h
  * Separate SDKs have all the functions we want, but older ones don't have
- * any version information. I use IPPROTO_IPV6 to detect a decent SDK.
+ * any version information. 
+ * I use SIO_GET_MULTICAST_FILTER to detect a decent SDK.
  */
-# ifdef IPPROTO_IPV6
+# ifdef SIO_GET_MULTICAST_FILTER
 #  include <MSTcpIP.h> /* for SIO_RCVALL */
 #  define HAVE_ADDRINFO
 #  define HAVE_SOCKADDR_STORAGE