summaryrefslogtreecommitdiff
path: root/Python/sysmodule.c
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-03-02 08:01:10 -0800
committerSteve Dower <steve.dower@microsoft.com>2015-03-02 08:01:10 -0800
commit547de7c7bdd902a96d8b74f35e3a24c4eeabaf2f (patch)
tree831e79465c2961a884ae7c239bfcea053e075d50 /Python/sysmodule.c
parent9144f6ff46b2952dfc477569cbee2d655b48eb20 (diff)
downloadcpython-547de7c7bdd902a96d8b74f35e3a24c4eeabaf2f.tar.gz
Issue #23451: Update pyconfig.h for Windows to require Vista headers and remove unnecessary version checks.
Diffstat (limited to 'Python/sysmodule.c')
-rw-r--r--Python/sysmodule.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 292830bc25..471389cf57 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -772,6 +772,12 @@ static PyStructSequence_Desc windows_version_desc = {
via indexing, the rest are name only */
};
+/* 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 *
sys_getwindowsversion(PyObject *self)
{
@@ -803,6 +809,8 @@ sys_getwindowsversion(PyObject *self)
return version;
}
+#pragma warning(pop)
+
#endif /* MS_WINDOWS */
#ifdef HAVE_DLOPEN