diff options
author | Steve Dower <steve.dower@microsoft.com> | 2015-03-02 08:01:10 -0800 |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2015-03-02 08:01:10 -0800 |
commit | 3e96f324dcdbeb78fcd8fa4ffe2cd0c67f3828b2 (patch) | |
tree | e717f66fa69341710e7a5f35300714c40011d595 /Modules/_winapi.c | |
parent | 2f3d440549345857c7b1a6deb377b5b69052f639 (diff) | |
download | cpython-git-3e96f324dcdbeb78fcd8fa4ffe2cd0c67f3828b2.tar.gz |
Issue #23451: Update pyconfig.h for Windows to require Vista headers and remove unnecessary version checks.
Diffstat (limited to 'Modules/_winapi.c')
-rw-r--r-- | Modules/_winapi.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/_winapi.c b/Modules/_winapi.c index 51c4d5f45c..0274874dda 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -1001,6 +1001,12 @@ PyDoc_STRVAR(GetVersion_doc, \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 @@ winapi_GetVersion(PyObject* self, PyObject* args) return PyLong_FromUnsignedLong(GetVersion()); } +#pragma warning(pop) + static PyObject * winapi_OpenProcess(PyObject *self, PyObject *args) { |