vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use _W64 to detect MinGW W64-32 instead of _FILE_OFFSET_BITS

Browse source 
In 94cee4a4c2 I overlooked that config.h
unconditionally sets _FILE_OFFSET_BITS, so it cannot be used to detect
MinGW W64 environment. It looks like Emacs folks already found
solution; instead of _FILE_OFFSET_BITS use _W64 as suggested in
http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00723.html
This commit is contained in:
Andrey Borzenkov 2014-01-18 20:04:11 +04:00
parent 9b9c4686f0
commit 5ef569df5b
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
* include/grub/osdep/hostfile_windows.h: Use _W64 instead of
FILE_OFFSET_BITS to differentiate between native MinGW and Mingw W64.
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com> 2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/terminfo.c: Recognize keys F1-F12. * grub-core/term/terminfo.c: Recognize keys F1-F12.

4
include/grub/osdep/hostfile_windows.h
View file

@ -69,8 +69,8 @@ enum grub_util_fd_open_flags_t
#if defined (__MINGW32__) && !defined (__MINGW64__) #if defined (__MINGW32__) && !defined (__MINGW64__)
/* 32 bit on MinGW-64 already redefines them if _FILE_OFFSET_BITS=64 */ /* 32 bit on Mingw-w64 already redefines them if _FILE_OFFSET_BITS=64 */
#if !defined(_FILE_OFFSET_BITS) #ifndef _W64
#define fseeko fseeko64 #define fseeko fseeko64
#define ftello ftello64 #define ftello ftello64
#endif #endif