diff options
| -rw-r--r-- | psutil/_psutil_mswindows.c | 10 | ||||
| -rw-r--r-- | setup.py | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/psutil/_psutil_mswindows.c b/psutil/_psutil_mswindows.c index c08259be..1db15593 100644 --- a/psutil/_psutil_mswindows.c +++ b/psutil/_psutil_mswindows.c @@ -524,7 +524,7 @@ get_process_memory_info(PyObject* self, PyObject* args) { HANDLE hProcess; DWORD pid; -#if (PSUTIL_WINVER >= 0x0501) // Windows XP with SP2 +#if (_WIN32_WINNT >= 0x0501) // Windows XP with SP2 PROCESS_MEMORY_COUNTERS_EX cnt; #else PROCESS_MEMORY_COUNTERS cnt; @@ -545,7 +545,7 @@ get_process_memory_info(PyObject* self, PyObject* args) return PyErr_SetFromWindowsErr(0); } -#if (PSUTIL_WINVER >= 0x0501) // Windows XP with SP2 +#if (_WIN32_WINNT >= 0x0501) // Windows XP with SP2 private = cnt.PrivateUsage; #endif @@ -608,7 +608,7 @@ get_process_memory_info_2(PyObject* self, PyObject* args) return NULL; } -#if (PSUTIL_WINVER >= 0x0501) // Windows XP with SP2 +#if (_WIN32_WINNT >= 0x0501) // Windows XP with SP2 private = process->PrivatePageCount; #else private = 0; @@ -1910,7 +1910,7 @@ set_process_priority(PyObject* self, PyObject* args) } -#if (PSUTIL_WINVER >= 0x0600) // Windows Vista +#if (_WIN32_WINNT >= 0x0600) // Windows Vista /* * Get process IO priority as a Python integer. */ @@ -2934,7 +2934,7 @@ PsutilMethods[] = "Return process priority."}, {"set_process_priority", set_process_priority, METH_VARARGS, "Set process priority."}, -#if (PSUTIL_WINVER >= 0x0600) // Windows Vista +#if (_WIN32_WINNT >= 0x0600) // Windows Vista {"get_process_io_priority", get_process_io_priority, METH_VARARGS, "Return process IO priority."}, {"set_process_io_priority", set_process_io_priority, METH_VARARGS, @@ -108,7 +108,10 @@ if sys.platform.startswith("win32"): 'psutil/arch/mswindows/security.c', ], define_macros=[ - ('PSUTIL_WINVER', get_winver()), + # be nice to mingw, see: + # http://www.mingw.org/wiki/Use_more_recent_defined_functions + ('_WIN32_WINNT', get_winver()), + ('_AVAIL_WINVER_', get_winver()), ], libraries=[ "psapi", "kernel32", "advapi32", "shell32", "netapi32", "iphlpapi", |