Merge pull request #590 from mindw/doc_and_warnings

docs and warning fix

3 files changed, 6 insertions, 2 deletions

diff --git a/CREDITS b/CREDITS
index a4b1b9ef..a1ec04e2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -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];