Mercurial > emacs

comparison src/w32.c @ 110400:c5508e3cbb4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7b41c068528a
children 9fe8167bbd9b
comparison
equal deleted inserted replaced
110399:e4c19190baef 110400:c5508e3cbb4f
92 #include <lmcons.h> 92 #include <lmcons.h>
93 #include <shlobj.h> 93 #include <shlobj.h>
94 94
95 #include <tlhelp32.h> 95 #include <tlhelp32.h>
96 #include <psapi.h> 96 #include <psapi.h>
97 #include <w32api.h>
98 #if !defined(__MINGW32__) || __W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15)
97 /* This either is not in psapi.h or guarded by higher value of 99 /* This either is not in psapi.h or guarded by higher value of
98 _WIN32_WINNT than what we use. */ 100 _WIN32_WINNT than what we use. w32api suplied with MinGW 3.15
101 defines it in psapi.h */
99 typedef struct _PROCESS_MEMORY_COUNTERS_EX { 102 typedef struct _PROCESS_MEMORY_COUNTERS_EX {
100 DWORD cb; 103 DWORD cb;
101 DWORD PageFaultCount; 104 DWORD PageFaultCount;
102 DWORD PeakWorkingSetSize; 105 DWORD PeakWorkingSetSize;
103 DWORD WorkingSetSize; 106 DWORD WorkingSetSize;
107 DWORD QuotaNonPagedPoolUsage; 110 DWORD QuotaNonPagedPoolUsage;
108 DWORD PagefileUsage; 111 DWORD PagefileUsage;
109 DWORD PeakPagefileUsage; 112 DWORD PeakPagefileUsage;
110 DWORD PrivateUsage; 113 DWORD PrivateUsage;
111 } PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX; 114 } PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX;
115 #endif
112 116
113 #ifdef HAVE_SOCKETS /* TCP connection support, if kernel can do it */ 117 #ifdef HAVE_SOCKETS /* TCP connection support, if kernel can do it */
114 #include <sys/socket.h> 118 #include <sys/socket.h>
115 #undef socket 119 #undef socket
116 #undef bind 120 #undef bind