Restore support for Microsoft VC6 compiler.

amauryfa · amauryfa · commit a4dd2e20e230 · 2008-06-13T00:42:22.000Z
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)
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
@@ -153,7 +153,7 @@ PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState;
    to a 8k margin. */
 #define PYOS_STACK_MARGIN 2048
 
-#if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER)
+#if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1300
 /* Enable stack checking under Microsoft C */
 #define USE_STACKCHECK
 #endif
diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c
@@ -5,7 +5,7 @@
 
 /* Windows socket errors (WSA*)  */
 #ifdef MS_WINDOWS
-#include <winsock.h>
+#include <windows.h>
 #endif
 
 /*
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -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
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
@@ -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>
diff --git a/PC/VC6/_socket.dsp b/PC/VC6/_socket.dsp
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
@@ -143,6 +143,7 @@ msvcrt_getch(PyObject *self, PyObject *args)
 	return PyString_FromStringAndSize(s, 1);
 }
 
+#ifdef _WCONIO_DEFINED
 static PyObject *
 msvcrt_getwch(PyObject *self, PyObject *args)
 {
@@ -158,6 +159,7 @@ msvcrt_getwch(PyObject *self, PyObject *args)
 	u[0] = ch;
 	return PyUnicode_FromUnicode(u, 1);
 }
+#endif
 
 static PyObject *
 msvcrt_getche(PyObject *self, PyObject *args)
@@ -175,6 +177,7 @@ msvcrt_getche(PyObject *self, PyObject *args)
 	return PyString_FromStringAndSize(s, 1);
 }
 
+#ifdef _WCONIO_DEFINED
 static PyObject *
 msvcrt_getwche(PyObject *self, PyObject *args)
 {
@@ -190,6 +193,7 @@ msvcrt_getwche(PyObject *self, PyObject *args)
 	s[0] = ch;
 	return PyUnicode_FromUnicode(s, 1);
 }
+#endif
 
 static PyObject *
 msvcrt_putch(PyObject *self, PyObject *args)
@@ -204,7 +208,7 @@ msvcrt_putch(PyObject *self, PyObject *args)
 	return Py_None;
 }
 
-
+#ifdef _WCONIO_DEFINED
 static PyObject *
 msvcrt_putwch(PyObject *self, PyObject *args)
 {
@@ -223,6 +227,7 @@ msvcrt_putwch(PyObject *self, PyObject *args)
 	Py_RETURN_NONE;
 
 }
+#endif
 
 static PyObject *
 msvcrt_ungetch(PyObject *self, PyObject *args)
@@ -238,6 +243,7 @@ msvcrt_ungetch(PyObject *self, PyObject *args)
 	return Py_None;
 }
 
+#ifdef _WCONIO_DEFINED
 static PyObject *
 msvcrt_ungetwch(PyObject *self, PyObject *args)
 {
@@ -251,6 +257,7 @@ msvcrt_ungetwch(PyObject *self, PyObject *args)
 	Py_INCREF(Py_None);
 	return Py_None;
 }
+#endif
 
 static void
 insertint(PyObject *d, char *name, int value)
@@ -279,11 +286,12 @@ static struct PyMethodDef msvcrt_functions[] = {
 	{"getche",		msvcrt_getche, METH_VARARGS},
 	{"putch",		msvcrt_putch, METH_VARARGS},
 	{"ungetch",		msvcrt_ungetch, METH_VARARGS},
+#ifdef _WCONIO_DEFINED
 	{"getwch",		msvcrt_getwch, METH_VARARGS},
 	{"getwche",		msvcrt_getwche, METH_VARARGS},
 	{"putwch",		msvcrt_putwch, METH_VARARGS},
 	{"ungetwch",		msvcrt_ungetwch, METH_VARARGS},
-
+#endif
 	{NULL,			NULL}
 };
 
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
@@ -467,13 +467,6 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 /* #undef size_t */
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#if _MSC_VER + 0 >= 1300
-/* VC.NET typedefs socklen_t in ws2tcpip.h. */
-#else
-#define socklen_t int
-#endif
-
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
 

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ msvcrt_getch(PyObject self, PyObject args)`
`143`	`143`	`return PyString_FromStringAndSize(s, 1);`
`144`	`144`	`}`
`145`	`145`
	`146`	`+#ifdef _WCONIO_DEFINED`
`146`	`147`	`static PyObject *`
`147`	`148`	`msvcrt_getwch(PyObject self, PyObject args)`
`148`	`149`	`{`
`@@ -158,6 +159,7 @@ msvcrt_getwch(PyObject self, PyObject args)`
`158`	`159`	`u[0] = ch;`
`159`	`160`	`return PyUnicode_FromUnicode(u, 1);`
`160`	`161`	`}`
	`162`	`+#endif`
`161`	`163`
`162`	`164`	`static PyObject *`
`163`	`165`	`msvcrt_getche(PyObject self, PyObject args)`
`@@ -175,6 +177,7 @@ msvcrt_getche(PyObject self, PyObject args)`
`175`	`177`	`return PyString_FromStringAndSize(s, 1);`
`176`	`178`	`}`
`177`	`179`
	`180`	`+#ifdef _WCONIO_DEFINED`
`178`	`181`	`static PyObject *`
`179`	`182`	`msvcrt_getwche(PyObject self, PyObject args)`
`180`	`183`	`{`
`@@ -190,6 +193,7 @@ msvcrt_getwche(PyObject self, PyObject args)`
`190`	`193`	`s[0] = ch;`
`191`	`194`	`return PyUnicode_FromUnicode(s, 1);`
`192`	`195`	`}`
	`196`	`+#endif`
`193`	`197`
`194`	`198`	`static PyObject *`
`195`	`199`	`msvcrt_putch(PyObject self, PyObject args)`
`@@ -204,7 +208,7 @@ msvcrt_putch(PyObject self, PyObject args)`
`204`	`208`	`return Py_None;`
`205`	`209`	`}`
`206`	`210`
`207`		`-`
	`211`	`+#ifdef _WCONIO_DEFINED`
`208`	`212`	`static PyObject *`
`209`	`213`	`msvcrt_putwch(PyObject self, PyObject args)`
`210`	`214`	`{`
`@@ -223,6 +227,7 @@ msvcrt_putwch(PyObject self, PyObject args)`
`223`	`227`	`Py_RETURN_NONE;`
`224`	`228`
`225`	`229`	`}`
	`230`	`+#endif`
`226`	`231`
`227`	`232`	`static PyObject *`
`228`	`233`	`msvcrt_ungetch(PyObject self, PyObject args)`
`@@ -238,6 +243,7 @@ msvcrt_ungetch(PyObject self, PyObject args)`
`238`	`243`	`return Py_None;`
`239`	`244`	`}`
`240`	`245`
	`246`	`+#ifdef _WCONIO_DEFINED`
`241`	`247`	`static PyObject *`
`242`	`248`	`msvcrt_ungetwch(PyObject self, PyObject args)`
`243`	`249`	`{`
`@@ -251,6 +257,7 @@ msvcrt_ungetwch(PyObject self, PyObject args)`
`251`	`257`	`Py_INCREF(Py_None);`
`252`	`258`	`return Py_None;`
`253`	`259`	`}`
	`260`	`+#endif`
`254`	`261`
`255`	`262`	`static void`
`256`	`263`	`insertint(PyObject d, char name, int value)`
`@@ -279,11 +286,12 @@ static struct PyMethodDef msvcrt_functions[] = {`
`279`	`286`	`{"getche", msvcrt_getche, METH_VARARGS},`
`280`	`287`	`{"putch", msvcrt_putch, METH_VARARGS},`
`281`	`288`	`{"ungetch", msvcrt_ungetch, METH_VARARGS},`
	`289`	`+#ifdef _WCONIO_DEFINED`
`282`	`290`	`{"getwch", msvcrt_getwch, METH_VARARGS},`
`283`	`291`	`{"getwche", msvcrt_getwche, METH_VARARGS},`
`284`	`292`	`{"putwch", msvcrt_putwch, METH_VARARGS},`
`285`	`293`	`{"ungetwch", msvcrt_ungetwch, METH_VARARGS},`
`286`		`-`
	`294`	`+#endif`
`287`	`295`	`{NULL, NULL}`
`288`	`296`	`};`
`289`	`297`