From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 17 Sep 2010 21:34:45 +0000 (+0200)
Subject: Fix bug #6989.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~103
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=69e847be9279a21364638f38ac4376c6f2583590;p=emacs.git

Fix bug #6989.

 w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
 of w32api >= 3.15.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 282394e1414..66735cd5f4e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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)
+
 2010-09-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* process.c (wait_reading_process_output): Don't message about
diff --git a/src/w32.c b/src/w32.c
index f1ed6ae0be9..c2bc94fae01 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -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 suplied 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_EX {
 	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>