[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100235: Back-port revision 101465 from the trunk, to resolve bug #7452.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100235
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-11-22 20:09:29 +0200
message:
  Back-port revision 101465 from the trunk, to resolve bug #7452.
  
   w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
   of w32api >= 3.15.
modified:
  src/ChangeLog
  src/w32.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-22 00:39:42 +0000
+++ b/src/ChangeLog     2010-11-22 18:09:29 +0000
@@ -1,3 +1,8 @@
+2010-11-22  Eli Zaretskii  <address@hidden>
+
+       * w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
+       of w32api >= 3.15.  (Bug#6989)  (Bug#7452)
+
 2010-11-22  YAMAMOTO Mitsuharu  <address@hidden>
 
        * alloc.c (mark_terminals): Ensure that the image cache is marked

=== modified file 'src/w32.c'
--- a/src/w32.c 2010-10-14 12:25:35 +0000
+++ b/src/w32.c 2010-11-22 18:09:29 +0000
@@ -94,8 +94,11 @@
 
 #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 @@
        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>