bug#7452: Duplicated Definitions

[Eli Zaretskii]

> Date: Sun, 21 Nov 2010 20:17:20 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 7452@debbugs.gnu.org
> 
> > Date: Sun, 21 Nov 2010 10:09:56 -0800
> > CC: <7452@debbugs.gnu.org>
> > From: Tak Ota <Takaaki.Ota@am.sony.com>
> > 
> > Sorry I forgot to note.  It is Emacs 23.2.90 pretest code.
> 
> OK, thanks.
> 
> > Do you still need the detail error message?
> 
> No, I know how to fix this.

Done.  Patch below, if you want to try it right away.

=== modified file 'src/ChangeLog'
--- src/ChangeLog       2010-09-17 15:47:49 +0000
+++ src/ChangeLog       2010-09-17 21:34:45 +0000
@@ -1,3 +1,8 @@
+2010-09-17  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-09-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * process.c (wait_reading_process_output): Don't message about

=== modified file 'src/w32.c'
--- src/w32.c   2010-08-06 19:52:47 +0000
+++ src/w32.c   2010-09-17 21:34:45 +0000
@@ -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_
        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>