diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2015-02-10 04:59:26 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2015-02-10 04:59:26 +0100 |
commit | 2b738eb674281a27ed306cbe8a9a749bb671eba0 (patch) | |
tree | 6459bc15deb7124b3e6084c75f6e677c6447b405 | |
parent | c19b914929fce0706a52859ae82e39ba54e0e714 (diff) | |
parent | 8ba4601122070b0b7f95a3732e82b1fec936b3d6 (diff) | |
download | psutil-2b738eb674281a27ed306cbe8a9a749bb671eba0.tar.gz |
Merge branch 'master' of github.com:giampaolo/psutil
-rw-r--r-- | CREDITS | 4 | ||||
-rw-r--r-- | HISTORY.rst | 2 | ||||
-rw-r--r-- | psutil/_psutil_windows.c | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -282,7 +282,9 @@ E: bruno.binet@gmail.com I: 572 N: Gabi Davar -I: 578, 581 +C: Israel +W: https://github.com/mindw +I: 578, 581, 587 N: spacewanderlzx C: Guangzhou,China diff --git a/HISTORY.rst b/HISTORY.rst index 8b8ca9f3..c654b41b 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -11,6 +11,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues - #581: add .gitignore. (patch by Gabi Davar) - #582: connection constants returned by psutil.net_connections() and psutil.Process.connections() were turned from int to enums on Python > 3.4. +- #587: Move native extension into the package. - #589: Process.cpu_affinity() accepts any kind of iterable (set, tuple, ...), not only lists. @@ -18,6 +19,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues - #555: [Linux] psutil.users() correctly handles ":0" as an alias for "localhost" +- #579: [Windows] Fixed open_files() for PID>64K. - #579: [Windows] fixed many compiler warnings. - #585: [FreeBSD] net_connections() may raise KeyError. - #586: [FreeBSD] cpu_affinity() segfaults on set in case an invalid CPU diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c index 0427bc1d..bb07ef80 100644 --- a/psutil/_psutil_windows.c +++ b/psutil/_psutil_windows.c @@ -3007,7 +3007,7 @@ psutil_net_if_addrs(PyObject *self, PyObject *args) LPVOID lpMsgBuf = NULL; ULONG outBufLen = 0; ULONG iterations = 0; - PCTSTR WSAAPI intRet; + PCTSTR intRet; char *ptr; char buff[100]; char ifname[MAX_PATH]; |