diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-06-14 11:59:52 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-06-14 11:59:52 (GMT) |
| commit | b072cf25796e2b2bc05967d6527508e1af3eb0bb (patch) | |
| tree | 2c3c2c5bdeee9e9c870a53e81063e6df497d966b /Modules/socketmodule.h | |
| parent | 6d291c14b056257dc421a8690fe8ee817df519ea (diff) | |
| download | cpython-b072cf25796e2b2bc05967d6527508e1af3eb0bb.zip cpython-b072cf25796e2b2bc05967d6527508e1af3eb0bb.tar.gz cpython-b072cf25796e2b2bc05967d6527508e1af3eb0bb.tar.bz2 | |
Merged revisions 64267-64272 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64267 | amaury.forgeotdarc | 2008-06-14 09:40:32 +0200 (Sa, 14 Jun 2008) | 2 lines
Use the correct URL for sqlite3 sources, and try to fix windows buildbots.
........
r64269 | amaury.forgeotdarc | 2008-06-14 10:36:07 +0200 (Sa, 14 Jun 2008) | 3 lines
on windows, r64214 broke compilation with some recent SDKs,
because IPPROTO_IPV6 may be an enumeration member...
........
r64270 | amaury.forgeotdarc | 2008-06-14 11:44:41 +0200 (Sa, 14 Jun 2008) | 4 lines
Since python2.6 must run on Windows 2000,
explicitely disable the use of Windows XP themes when compiling tk.
This is also consistent with the WINVER=0x0500 option.
........
r64271 | martin.v.loewis | 2008-06-14 13:50:59 +0200 (Sa, 14 Jun 2008) | 3 lines
Avoid rebuilding tcl/tk.
Merge x86 changes into AMD64.
........
r64272 | martin.v.loewis | 2008-06-14 13:51:54 +0200 (Sa, 14 Jun 2008) | 2 lines
Set eol-style to CRLF for all batch files.
........
Diffstat (limited to 'Modules/socketmodule.h')
| -rw-r--r-- | Modules/socketmodule.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h index a24110f..8d19cbf 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 |