mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 12:44:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Restore support for Microsoft VC6 compiler.

Browse source 
Some functions in the msvcrt module are skipped,
and socket.ioctl is enabled only when using a more recent Platform SDK.

(and yes, there are still companies that use a 10-years old compiler)
This commit is contained in:
Amaury Forgeot d'Arc 2008-06-13 00:42:22 +00:00
parent 114f7e5fff
commit a4dd2e20e2
8 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/errnomodule.c
View file

@ -5,7 +5,7 @@
/* Windows socket errors (WSA*) */
#ifdef MS_WINDOWS
#include <winsock.h>
#include <windows.h>
#endif
/*

4
Modules/socketmodule.c
View file

@ -2805,7 +2805,7 @@ PyDoc_STRVAR(shutdown_doc,
Shut down the reading side of the socket (flag == SHUT_RD), the writing side\n\
of the socket (flag == SHUT_WR), or both ends (flag == SHUT_RDWR).");
#ifdef MS_WINDOWS
#if defined(MS_WINDOWS) && defined(SIO_RCVALL)
static PyObject*
sock_ioctl(PySocketSockObject *s, PyObject *arg)
{
@ -2858,7 +2858,7 @@ static PyMethodDef sock_methods[] = {
METH_NOARGS, getsockname_doc},
{"getsockopt", (PyCFunction)sock_getsockopt, METH_VARARGS,
getsockopt_doc},
#ifdef MS_WINDOWS
#if defined(MS_WINDOWS) && defined(SIO_RCVALL)
{"ioctl", (PyCFunction)sock_ioctl, METH_VARARGS,
sock_ioctl_doc},
#endif

26
Modules/socketmodule.h
View file

@ -13,19 +13,23 @@
# endif
#else /* MS_WINDOWS */
#if _MSC_VER >= 1300
# include <winsock2.h>
# include <ws2tcpip.h>
# include <MSTcpIP.h> /* for SIO_RCVALL */
# define HAVE_ADDRINFO
# define HAVE_SOCKADDR_STORAGE
# define HAVE_GETADDRINFO
# define HAVE_GETNAMEINFO
# define ENABLE_IPV6
#else
# include <winsock.h>
#endif
#endif
/* 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.
*/
# ifdef IPPROTO_IPV6
# include <MSTcpIP.h> /* for SIO_RCVALL */
# define HAVE_ADDRINFO
# define HAVE_SOCKADDR_STORAGE
# define HAVE_GETADDRINFO
# define HAVE_GETNAMEINFO
# define ENABLE_IPV6
# else
typedef int socklen_t;
# endif /* IPPROTO_IPV6 */
#endif /* MS_WINDOWS */
#ifdef HAVE_SYS_UN_H
# include <sys/un.h>