[Emacs-diffs] Changes to emacs/src/w32.c,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/08/15 12:48:21

Index: w32.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- w32.c       9 Aug 2008 19:05:02 -0000       1.150
+++ w32.c       15 Aug 2008 12:48:21 -0000      1.151
@@ -73,8 +73,9 @@
 #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 @@
         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 * 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_ex (
-    MEMORYSTATUSEX *buf)
+    MEMORY_STATUS_EX *buf)
 {
   static GlobalMemoryStatusEx_Proc s_pfn_Global_Memory_Status_Ex = NULL;
 
@@ -3658,7 +3659,7 @@
   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;