Issue #23451: Update pyconfig.h for Windows to require Vista headers and remove unnecessary version checks.
diff --git a/Modules/_winapi.c b/Modules/_winapi.c
index 51c4d5f..0274874 100644
--- a/Modules/_winapi.c
+++ b/Modules/_winapi.c
@@ -1001,6 +1001,12 @@
\n\
Return the version number of the current operating system.");
+/* Disable deprecation warnings about GetVersionEx as the result is
+ being passed straight through to the caller, who is responsible for
+ using it correctly. */
+#pragma warning(push)
+#pragma warning(disable:4996)
+
static PyObject *
winapi_GetVersion(PyObject* self, PyObject* args)
{
@@ -1010,6 +1016,8 @@
return PyLong_FromUnsignedLong(GetVersion());
}
+#pragma warning(pop)
+
static PyObject *
winapi_OpenProcess(PyObject *self, PyObject *args)
{
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index b83f9af..4b6a10e 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -14,6 +14,13 @@
#else /* MS_WINDOWS */
# include <winsock2.h>
+/* Windows 'supports' CMSG_LEN, but does not follow the POSIX standard
+ * interface at all, so there is no point including the code that
+ * attempts to use it.
+ */
+# ifdef PySocket_BUILDING_SOCKET
+# undef CMSG_LEN
+# endif
# 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