bug#6989: 24.0.50; w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'

bug#6989: 24.0.50; w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'

[Stephen Powell]

I get this error when compiling emacs under cygwin:

w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'

This is the code in w32.c:

#include <psapi.h>
/* This either is not in psapi.h or guarded by higher value of
   _WIN32_WINNT than what we use.  */
typedef struct _PROCESS_MEMORY_COUNTERS_EX {

However since the update of w32api-3.15-1
<http://cygwin.com/ml/cygwin-announce/2010-08/msg00033.html>
on the 28 August struct _PROCESS_MEMORY_COUNTERS_EX is defined.


In GNU Emacs 24.0.50.1 (i386-mingw-nt6.0.6002)
 of 2010-09-02 on STEVEP-PC
Windowing system distributor `Microsoft Corp.', version 6.0.6002
configured using `configure --with-gcc (3.4)'

bug#6989: 24.0.50; w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'

[Eli Zaretskii]

> Date: Mon, 06 Sep 2010 01:55:19 +0100
> From: Stephen Powell <stephen_powell@optusnet.com.au>
> Cc: 
> 
> I get this error when compiling emacs under cygwin:
> 
> w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'
> 
> This is the code in w32.c:
> 
> #include <psapi.h>
> /* This either is not in psapi.h or guarded by higher value of
>    _WIN32_WINNT than what we use.  */
> typedef struct _PROCESS_MEMORY_COUNTERS_EX {
> 
> However since the update of w32api-3.15-1
> <http://cygwin.com/ml/cygwin-announce/2010-08/msg00033.html>
> on the 28 August struct _PROCESS_MEMORY_COUNTERS_EX is defined.

Can you show its definition in w32api 3.15-1, and also tell which
header defines it?

Thanks.

bug#6989: 24.0.50; w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'

[Stephen Powell]

Eli Zaretskii <eliz@gnu.org> writes:

> Can you show its definition in w32api 3.15-1, and also tell which
> header defines it?

,----[ c:/cygwin/usr/include/w32api/psapi.h ]
|
| 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;
|
`----

bug#6989: 24.0.50; w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'

[Eli Zaretskii]

> Date: Mon, 06 Sep 2010 09:54:04 +0100
> From: Stephen Powell <stephen_powell@optusnet.com.au>
> CC: 6989@debbugs.gnu.org
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > Can you show its definition in w32api 3.15-1, and also tell which
> > header defines it?
> 
> ,----[ c:/cygwin/usr/include/w32api/psapi.h ]
> |
> | 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;
> |
> `----

Thanks.  One more question: is it true that w32api 3.14 didn't have
this typedef in psapi.h, and 3.15 introduced it?

bug#6989: 24.0.50; w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'

[Stephen Powell]

*** E-Mail body has been placed on clipboard, please paste it here! ***

bug#6989: 24.0.50; w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'

[Stephen Powell]

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

bug#6989: 24.0.50; w32.c:99: error: redefinition of `struct _PROCESS_MEMORY_COUNTERS_EX'

[Eli Zaretskii]

> Date: Tue, 07 Sep 2010 10:41:48 +0100
> From: Stephen Powell <stephen_powell@optusnet.com.au>
> CC: stephen_powell@optusnet.com.au, 6989@debbugs.gnu.org
> 
> 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.

Thanks.  This should now be fixed (revno 101465).  Please try it, and
if the problem still persists, reopen this bug report.