Commit 69e847be authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix bug #6989.

 w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
 of w32api >= 3.15.
parent a67597d6
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> 2010-09-17 Lars Magne Ingebrigtsen <larsi@gnus.org>
   
* process.c (wait_reading_process_output): Don't message about * process.c (wait_reading_process_output): Don't message about
......
...@@ -94,8 +94,11 @@ typedef struct _MEMORY_STATUS_EX { ...@@ -94,8 +94,11 @@ typedef struct _MEMORY_STATUS_EX {
#include <tlhelp32.h> #include <tlhelp32.h>
#include <psapi.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 /* 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 { typedef struct _PROCESS_MEMORY_COUNTERS_EX {
DWORD cb; DWORD cb;
DWORD PageFaultCount; DWORD PageFaultCount;
...@@ -109,6 +112,7 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX { ...@@ -109,6 +112,7 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
DWORD PeakPagefileUsage; DWORD PeakPagefileUsage;
DWORD PrivateUsage; DWORD PrivateUsage;
} PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX; } PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX;
#endif
#ifdef HAVE_SOCKETS /* TCP connection support, if kernel can do it */ #ifdef HAVE_SOCKETS /* TCP connection support, if kernel can do it */
#include <sys/socket.h> #include <sys/socket.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment