From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Powell Newsgroups: gmane.emacs.bugs 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 Message-ID: <4C8608DC.9020001@optusnet.com.au> References: <4C843BF7.7070800@optusnet.com.au> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1283854232 29366 80.91.229.12 (7 Sep 2010 10:10:32 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 7 Sep 2010 10:10:32 +0000 (UTC) Cc: stephen_powell@optusnet.com.au, 6989@debbugs.gnu.org To: eliz@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Sep 07 12:10:28 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Osv8C-0008Un-IU for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 Sep 2010 12:10:24 +0200 Original-Received: from localhost ([127.0.0.1]:40148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Osv8B-0000Uq-QE for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 Sep 2010 06:10:23 -0400 Original-Received: from [140.186.70.92] (port=35043 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Osv7v-0000Od-GA for bug-gnu-emacs@gnu.org; Tue, 07 Sep 2010 06:10:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Osv7t-0002LU-VC for bug-gnu-emacs@gnu.org; Tue, 07 Sep 2010 06:10:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:39454) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Osv7t-0002LQ-Tn for bug-gnu-emacs@gnu.org; Tue, 07 Sep 2010 06:10:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Osufm-0006JH-FV; Tue, 07 Sep 2010 05:41:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <4C843BF7.7070800@optusnet.com.au> Resent-From: Stephen Powell Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 07 Sep 2010 09:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6989 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 6989-submit@debbugs.gnu.org id=B6989.128385242024246 (code B ref 6989); Tue, 07 Sep 2010 09:41:02 +0000 Original-Received: (at 6989) by debbugs.gnu.org; 7 Sep 2010 09:40:20 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Osuf6-0006J1-7i for submit@debbugs.gnu.org; Tue, 07 Sep 2010 05:40:20 -0400 Original-Received: from mail08.syd.optusnet.com.au ([211.29.132.189]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Osuf3-0006Iw-2y for 6989@debbugs.gnu.org; Tue, 07 Sep 2010 05:40:18 -0400 Original-Received: from [192.168.0.3] (c122-107-118-196.carlnfd1.nsw.optusnet.com.au [122.107.118.196]) (authenticated sender stephen_powell@optusnet.com.au) by mail08.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id o879g9Ko009500; Tue, 7 Sep 2010 19:42:09 +1000 User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.8) Gecko/20100802 Lightning/1.0b2 Thunderbird/3.1.2 ThunderBrowse/3.3.1 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Tue, 07 Sep 2010 05:41:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:40014 Archived-At: Eli Zaretskii 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 : 2010-06-28 Rick Rankin * 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---