dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch

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