Mercurial > emacs
changeset 111760:b9089a7c21ab
Back-port revision 101465 from the trunk, to resolve bug #7452.
w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
of w32api >= 3.15.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Mon, 22 Nov 2010 20:09:29 +0200 |
| parents | 3e35cf2d7f2e |
| children | 6e3b84ac704d |
| files | src/ChangeLog src/w32.c |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Nov 22 05:52:49 2010 +0200 +++ b/src/ChangeLog Mon Nov 22 20:09:29 2010 +0200 @@ -1,3 +1,8 @@ +2010-11-22 Eli Zaretskii <eliz@gnu.org> + + * w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions + of w32api >= 3.15. (Bug#6989) (Bug#7452) + 2010-11-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * alloc.c (mark_terminals): Ensure that the image cache is marked
--- a/src/w32.c Mon Nov 22 05:52:49 2010 +0200 +++ b/src/w32.c Mon Nov 22 20:09:29 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 supplied 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>