Replace uses of _W64 with MINGW_W64

This is the `master' branch follow-up to the change made previously on
the emacs-24 branch (81e0cca7bbc99dbfda898a8aaab740ae121cf045).

    * src/w32.c: Use MINGW_W64 instead of _W64.

    * src/w32heap.c: Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index e6bbeb8b864228a7c4a14c0abf16eed29a4a4d45..dcb4666e1066f55347dc84e6abb0491a2b54c66e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-27  Oscar Fuentes  <ofv@wanadoo.es>
+
+       * src/w32.c: Use MINGW_W64 instead of _W64.
+
+       * src/w32heap.c: Likewise.
+
 2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
 
        * src/w32.c: Use MINGW_W64 instead of _W64.

diff --git a/src/w32.c b/src/w32.c
index ca5e14bc60a50e3a6ff256367b98d9e7626d974a..8d8f536ca401fb7337cdded93e04f175bcb2e278 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -72,7 +72,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <pwd.h>
 #include <grp.h>
 
-/* MinGW64 (_W64) defines these in its _mingw.h.  */
+/* MinGW64 defines these in its _mingw.h.  */
 #ifndef _ANONYMOUS_UNION
 # define _ANONYMOUS_UNION
 #endif

diff --git a/src/w32heap.c b/src/w32heap.c
index c431b87e0c25eb015b8cd01895481f9cacfc11ad..2a766419b25daaa30db9d7e1558cdb87eb327538 100644 (file)
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -214,7 +214,7 @@ dumped_data_commit (PVOID Base, PVOID *CommitAddress, PSIZE_T CommitSize)
 
 /* We want to turn on Low Fragmentation Heap for XP and older systems.
    MinGW32 lacks those definitions.  */
-#ifndef _W64
+#ifndef MINGW_W64
 typedef enum _HEAP_INFORMATION_CLASS {
   HeapCompatibilityInformation
 } HEAP_INFORMATION_CLASS;
@@ -244,7 +244,7 @@ init_heap (void)
       /* Create the private heap.  */
       heap = HeapCreate (0, 0, 0);
 
-#ifndef _W64
+#ifndef MINGW_W64
       /* Set the low-fragmentation heap for OS before Vista.  */
       HMODULE hm_kernel32dll = LoadLibrary ("kernel32.dll");
       HeapSetInformation_Proc s_pfn_Heap_Set_Information = (HeapSetInformation_Proc) GetProcAddress (hm_kernel32dll, "HeapSetInformation");