(_MEMORY_STATUS_EX, MEMORY_STATUS_EX, LPMEMORY_STATUS_EX): Rename from

_MEMORYSTATUSEX, MEMORYSTATUSEX, LPMEMORYSTATUSEX.  All users changed.

2 files changed, 13 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d9122e10ea3..1576266855e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (_MEMORY_STATUS_EX, MEMORY_STATUS_EX, LPMEMORY_STATUS_EX):
+        Rename from _MEMORYSTATUSEX, MEMORYSTATUSEX, LPMEMORYSTATUSEX.
+        All users changed.
+
 2008-08-14  Lawrence Mitchell  <wence@gmx.li>
 
         * lread.c (Fread_char, Fread_char_exclusive): If no character
diff --git a/src/w32.c b/src/w32.c
index 2407cb171be..cf4bd7bec71 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -73,8 +73,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define _ANONYMOUS_STRUCT
 #endif
 #include <windows.h>
-/* This is guarded by a higher value of _WIN32_WINNT than what we use.  */
-typedef struct _MEMORYSTATUSEX {
+/* Some versions of compiler define MEMORYSTATUSEX, some don't, so we
+   use a different name to avoid compilation problems.  */
+typedef struct _MEMORY_STATUS_EX {
         DWORD dwLength;
         DWORD dwMemoryLoad;
         DWORDLONG ullTotalPhys;
@@ -84,7 +85,7 @@ typedef struct _MEMORYSTATUSEX {
         DWORDLONG ullTotalVirtual;
         DWORDLONG ullAvailVirtual;
         DWORDLONG ullAvailExtendedVirtual;
-} MEMORYSTATUSEX,*LPMEMORYSTATUSEX;
+} MEMORY_STATUS_EX,*LPMEMORY_STATUS_EX;
 
 #include <lmcons.h>
 #include <shlobj.h>
@@ -279,7 +280,7 @@ typedef BOOL (WINAPI * GetProcessWorkingSetSize_Proc) (
 typedef BOOL (WINAPI * GlobalMemoryStatus_Proc) (
     LPMEMORYSTATUS lpBuffer);
 typedef BOOL (WINAPI * GlobalMemoryStatusEx_Proc) (
-    LPMEMORYSTATUSEX lpBuffer);
+    LPMEMORY_STATUS_EX lpBuffer);
 
   /* ** A utility function ** */
 static BOOL
@@ -3459,7 +3460,7 @@ BOOL WINAPI global_memory_status (
 }
 
 BOOL WINAPI global_memory_status_ex (
-    MEMORYSTATUSEX *buf)
+    MEMORY_STATUS_EX *buf)
 {
   static GlobalMemoryStatusEx_Proc s_pfn_Global_Memory_Status_Ex = NULL;
 
@@ -3658,7 +3659,7 @@ w32_system_process_attributes (pid)
   PROCESS_MEMORY_COUNTERS_EX mem_ex;
   DWORD minrss, maxrss;
   MEMORYSTATUS memst;
-  MEMORYSTATUSEX memstex;
+  MEMORY_STATUS_EX memstex;
   double totphys = 0.0;
   Lisp_Object ctime, stime, utime, etime;
   double pcpu;