You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.4 KiB
42 lines
1.4 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Andrey Borzenkov <arvidjaar@gmail.com> |
|
Date: Tue, 7 Jan 2014 18:43:02 +0400 |
|
Subject: [PATCH] fix 32 bit compilation on MinGW-w64 |
|
|
|
Use _FILE_OFFSET_BITS macro to distinguish between native MinGW and |
|
32 bit under MinGW-64. The latter does not require fseeko/ftello |
|
redefinition which it already does in case of _FILE_OFFSET_BITS=64. |
|
--- |
|
include/grub/osdep/hostfile_windows.h | 3 +++ |
|
ChangeLog | 5 +++++ |
|
2 files changed, 8 insertions(+) |
|
|
|
diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h |
|
index 36615b2c451..79efcfa5084 100644 |
|
--- a/include/grub/osdep/hostfile_windows.h |
|
+++ b/include/grub/osdep/hostfile_windows.h |
|
@@ -69,8 +69,11 @@ enum grub_util_fd_open_flags_t |
|
|
|
#if defined (__MINGW32__) && !defined (__MINGW64__) |
|
|
|
+/* 32 bit on MinGW-64 already redefines them if _FILE_OFFSET_BITS=64 */ |
|
+#if !defined(_FILE_OFFSET_BITS) |
|
#define fseeko fseeko64 |
|
#define ftello ftello64 |
|
+#endif |
|
|
|
#endif |
|
|
|
diff --git a/ChangeLog b/ChangeLog |
|
index 8c1ececa1ed..e87f0a7a4a4 100644 |
|
--- a/ChangeLog |
|
+++ b/ChangeLog |
|
@@ -1,3 +1,8 @@ |
|
+2014-01-07 Andrey Borzenkov <arvidjaar@gmail.com> |
|
+ |
|
+ * include/grub/osdep/hostfile_windows.h: Do not redefine fseeko/ftello |
|
+ on MinGW-64 when compiling for 32 bits. |
|
+ |
|
2013-12-30 Andrey Borzenkov <arvidjaar@gmail.com> |
|
|
|
* grub-core/Makefile.core.def: strip .eh_frame section for arm64-efi.
|
|
|