From: Andrey Borzenkov Date: Tue, 7 Jan 2014 14:43:02 +0000 (+0400) Subject: fix 32 bit compilation on MinGW-w64 X-Git-Tag: 2.02-beta3~711 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94cee4a4c201bb506377b2c26e072eee8cb19d6f;p=thirdparty%2Fgrub.git 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. --- diff --git a/ChangeLog b/ChangeLog index 8c1ececa1..e87f0a7a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-01-07 Andrey Borzenkov + + * include/grub/osdep/hostfile_windows.h: Do not redefine fseeko/ftello + on MinGW-64 when compiling for 32 bits. + 2013-12-30 Andrey Borzenkov * grub-core/Makefile.core.def: strip .eh_frame section for arm64-efi. diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h index 36615b2c4..79efcfa50 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