|
 |
4fe85b |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
4fe85b |
From: Andrey Borzenkov <arvidjaar@gmail.com>
|
|
|
4fe85b |
Date: Sat, 18 Jan 2014 20:04:11 +0400
|
|
|
4fe85b |
Subject: [PATCH] Use _W64 to detect MinGW W64-32 instead of _FILE_OFFSET_BITS
|
|
|
4fe85b |
|
|
|
4fe85b |
In 94cee4a4c201bb506377b2c26e072eee8cb19d6f I overlooked that config.h
|
|
|
4fe85b |
unconditionally sets _FILE_OFFSET_BITS, so it cannot be used to detect
|
|
|
4fe85b |
MinGW W64 environment. It looks like Emacs folks already found
|
|
|
4fe85b |
solution; instead of _FILE_OFFSET_BITS use _W64 as suggested in
|
|
|
4fe85b |
http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00723.html
|
|
|
4fe85b |
---
|
|
|
4fe85b |
include/grub/osdep/hostfile_windows.h | 4 ++--
|
|
|
4fe85b |
ChangeLog | 5 +++++
|
|
|
4fe85b |
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
4fe85b |
|
|
|
4fe85b |
diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h
|
|
|
4fe85b |
index 79efcfa5084..bf6451b6db4 100644
|
|
|
4fe85b |
--- a/include/grub/osdep/hostfile_windows.h
|
|
|
4fe85b |
+++ b/include/grub/osdep/hostfile_windows.h
|
|
|
4fe85b |
@@ -69,8 +69,8 @@ enum grub_util_fd_open_flags_t
|
|
|
4fe85b |
|
|
|
4fe85b |
#if defined (__MINGW32__) && !defined (__MINGW64__)
|
|
|
4fe85b |
|
|
|
4fe85b |
-/* 32 bit on MinGW-64 already redefines them if _FILE_OFFSET_BITS=64 */
|
|
|
4fe85b |
-#if !defined(_FILE_OFFSET_BITS)
|
|
|
4fe85b |
+/* 32 bit on Mingw-w64 already redefines them if _FILE_OFFSET_BITS=64 */
|
|
|
4fe85b |
+#ifndef _W64
|
|
|
4fe85b |
#define fseeko fseeko64
|
|
|
4fe85b |
#define ftello ftello64
|
|
|
4fe85b |
#endif
|
|
|
4fe85b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
4fe85b |
index fcbf2207b32..5aac7c1d854 100644
|
|
|
4fe85b |
--- a/ChangeLog
|
|
|
4fe85b |
+++ b/ChangeLog
|
|
|
4fe85b |
@@ -1,3 +1,8 @@
|
|
|
4fe85b |
+2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
|
|
|
4fe85b |
+
|
|
|
4fe85b |
+ * include/grub/osdep/hostfile_windows.h: Use _W64 instead of
|
|
|
4fe85b |
+ FILE_OFFSET_BITS to differentiate between native MinGW and Mingw W64.
|
|
|
4fe85b |
+
|
|
|
4fe85b |
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
4fe85b |
|
|
|
4fe85b |
* grub-core/term/terminfo.c: Recognize keys F1-F12.
|