procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Back-port 2010-09-17T21:34:45Z!eliz@gnu.org from the trunk, to resolve bug #7452.

Browse source 
w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
 of w32api >= 3.15.
This commit is contained in:
Eli Zaretskii 2010-11-22 20:09:29 +02:00
parent 0c3b672775
commit b8e5cf1da0
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

6
src/w32.c
View file

@ -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>