Mercurial > emacs
changeset 110400:c5508e3cbb4f
Fix bug #6989.
w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
of w32api >= 3.15.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 17 Sep 2010 23:34:45 +0200 |
| parents | e4c19190baef |
| children | 1b38d71f516b |
| files | src/ChangeLog src/w32.c |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Sep 17 23:07:57 2010 +0200 +++ b/src/ChangeLog Fri Sep 17 23:34:45 2010 +0200 @@ -1,3 +1,8 @@ +2010-09-17 Eli Zaretskii <eliz@gnu.org> + + * w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions + of w32api >= 3.15. (Bug#6989) + 2010-09-17 Lars Magne Ingebrigtsen <larsi@gnus.org> * process.c (wait_reading_process_output): Don't message about
--- a/src/w32.c Fri Sep 17 23:07:57 2010 +0200 +++ b/src/w32.c Fri Sep 17 23:34:45 2010 +0200 @@ -94,8 +94,11 @@ #include <tlhelp32.h> #include <psapi.h> +#include <w32api.h> +#if !defined(__MINGW32__) || __W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15) /* This either is not in psapi.h or guarded by higher value of - _WIN32_WINNT than what we use. */ + _WIN32_WINNT than what we use. w32api suplied with MinGW 3.15 + defines it in psapi.h */ typedef struct _PROCESS_MEMORY_COUNTERS_EX { DWORD cb; DWORD PageFaultCount; @@ -109,6 +112,7 @@ DWORD PeakPagefileUsage; DWORD PrivateUsage; } PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX; +#endif #ifdef HAVE_SOCKETS /* TCP connection support, if kernel can do it */ #include <sys/socket.h>