From: Stephen Powell <stephen_powell@optusnet.com.au>
To: eliz@gnu.org
Cc: stephen_powell@optusnet.com.au, 6989@debbugs.gnu.org
Subject: bug#6989: 24.0.50; w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'
Date: Tue, 07 Sep 2010 10:41:48 +0100 [thread overview]
Message-ID: <4C8608DC.9020001@optusnet.com.au> (raw)
In-Reply-To: <4C843BF7.7070800@optusnet.com.au>
Eli Zaretskii <eliz@gnu.org> writes:
> Thanks. One more question: is it true that w32api 3.14 didn't have
> this typedef in psapi.h, and 3.15 introduced it?
According to the cvs log the upstream change was introduced here
<http://cygwin.com/cgi-bin/cvsweb.cgi/src/winsup/w32api/ChangeLog?rev=1.1055&cvsroot=src>
:
2010-06-28 Rick Rankin <rrankin1424-mingw@yahoo.com>
* include/psapi.h (PROCESS_MEMORY_COUNTERS_EX, PERFORMANCE_INFORMATION,
GetPerformanceInfo): Define.
* lib/psapi.def (GetPerformanceInfo): Define.
* include/wincrypt.h (CryptEnumProvidersA, CryptEnumProvidersW,
CryptEnumProviders): Define.
The diff of the two versions:
--8<---------------cut here---------------start------------->8---
*** c:/temp/w32api-3.14-1/include/psapi.h 2008-01-30 07:34:43.000000000
+1100
--- c:/cygwin/usr/include/w32api/psapi.h 2010-08-28 10:11:17.001000000 +1000
***************
*** 50,55 ****
--- 50,86 ----
DWORD PeakPagefileUsage;
} PROCESS_MEMORY_COUNTERS,*PPROCESS_MEMORY_COUNTERS;
+ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
+ DWORD cb;
+ DWORD PageFaultCount;
+ DWORD PeakWorkingSetSize;
+ DWORD WorkingSetSize;
+ DWORD QuotaPeakPagedPoolUsage;
+ DWORD QuotaPagedPoolUsage;
+ DWORD QuotaPeakNonPagedPoolUsage;
+ DWORD QuotaNonPagedPoolUsage;
+ DWORD PagefileUsage;
+ DWORD PeakPagefileUsage;
+ DWORD PrivateUsage;
+ } PROCESS_MEMORY_COUNTERS_EX,*PPROCESS_MEMORY_COUNTERS_EX;
+
+ typedef struct _PERFORMANCE_INFORMATION {
+ DWORD cb;
+ DWORD CommitTotal;
+ DWORD CommitLimit;
+ DWORD CommitPeak;
+ DWORD PhysicalTotal;
+ DWORD PhysicalAvailable;
+ DWORD SystemCache;
+ DWORD KernelTotal;
+ DWORD KernelPaged;
+ DWORD KernelNonpaged;
+ DWORD PageSize;
+ DWORD HandleCount;
+ DWORD ProcessCount;
+ DWORD ThreadCount;
+ } PERFORMANCE_INFORMATION, *PPERFORMANCE_INFORMATION;
+
/* Grouped by application,not in alphabetical order. */
BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *);
BOOL WINAPI EnumProcessModules(HANDLE,HMODULE *,DWORD,LPDWORD);
***************
*** 70,75 ****
--- 101,107 ----
DWORD WINAPI GetDeviceDriverFileNameA(LPVOID,LPSTR,DWORD);
DWORD WINAPI GetDeviceDriverFileNameW(LPVOID,LPWSTR,DWORD);
BOOL WINAPI GetProcessMemoryInfo(HANDLE,PPROCESS_MEMORY_COUNTERS,DWORD);
+ BOOL WINAPI GetPerformanceInfo(PPERFORMANCE_INFORMATION,DWORD);
#if (_WIN32_WINNT >= 0x0501)
DWORD WINAPI GetProcessImageFileNameA(HANDLE,LPSTR,DWORD);
DWORD WINAPI GetProcessImageFileNameW(HANDLE,LPWSTR,DWORD);
--8<---------------cut here---------------end--------------->8---
next prev parent reply other threads:[~2010-09-07 9:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-06 0:55 bug#6989: 24.0.50; w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX' Stephen Powell
2010-09-06 6:18 ` Eli Zaretskii
2010-09-06 8:54 ` Stephen Powell
2010-09-06 17:38 ` Eli Zaretskii
2010-09-07 9:35 ` Stephen Powell
2010-09-07 9:41 ` Stephen Powell [this message]
2010-09-17 21:38 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C8608DC.9020001@optusnet.com.au \
--to=stephen_powell@optusnet.com.au \
--cc=6989@debbugs.gnu.org \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).