diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-11-22 20:09:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-11-22 20:09:29 +0200 |
| commit | b8e5cf1da0ef8f5e3cc37dd4276fe813f0305182 (patch) | |
| tree | 26cd612c45d00094f6d01c053e46d2f5d89b64aa /src/w32.c | |
| parent | 0c3b672775df3ba6f1f165e5565765a29ce5616d (diff) | |
| download | emacs-b8e5cf1da0ef8f5e3cc37dd4276fe813f0305182.tar.gz | |
Back-port 2010-09-17T21:34:45Z!eliz@gnu.org from the trunk, to resolve bug #7452.
w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
of w32api >= 3.15.
Diffstat (limited to 'src/w32.c')
| -rw-r--r-- | src/w32.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/w32.c b/src/w32.c index d96abd346f5..1b01a631850 100644 --- a/src/w32.c +++ b/src/w32.c @@ -94,8 +94,11 @@ typedef struct _MEMORY_STATUS_EX { #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 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX { 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> |