[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1ed5c2d: Replace uses of _W64 with MINGW_W64
From: |
Oscar Fuentes |
Subject: |
[Emacs-diffs] master 1ed5c2d: Replace uses of _W64 with MINGW_W64 |
Date: |
Thu, 27 Nov 2014 03:07:24 +0000 |
branch: master
commit 1ed5c2d9bcc99c92cff1f6382e4c39c70a126f62
Author: Oscar Fuentes <address@hidden>
Date: Thu Nov 27 04:03:07 2014 +0100
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.
---
src/ChangeLog | 6 ++++++
src/w32.c | 2 +-
src/w32heap.c | 4 ++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index e6bbeb8..dcb4666 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-27 Oscar Fuentes <address@hidden>
+
+ * src/w32.c: Use MINGW_W64 instead of _W64.
+
+ * src/w32heap.c: Likewise.
+
2014-11-17 Oscar Fuentes <address@hidden>
* src/w32.c: Use MINGW_W64 instead of _W64.
diff --git a/src/w32.c b/src/w32.c
index ca5e14b..8d8f536 100644
--- 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 c431b87..2a76641 100644
--- 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");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 1ed5c2d: Replace uses of _W64 with MINGW_W64,
Oscar Fuentes <=