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

fix include loop on MinGW due to libintl.h pulling stdio.h

Browse source 
In file included from ./include/grub/dl.h:23:0,
                 from grub-core/lib/libgcrypt-grub/cipher/rfc2268.c:3:
./include/grub/list.h:34:18: warning: conflicting types for 'grub_list_push' [en
abled by default]
 void EXPORT_FUNC(grub_list_push) (grub_list_t *head, grub_list_t item);
                  ^
./include/grub/symbol.h:68:25: note: in definition of macro 'EXPORT_FUNC'
 # define EXPORT_FUNC(x) x
                         ^
In file included from ./include/grub/fs.h:30:0,
                 from ./include/grub/file.h:25,
                 from ./grub-core/lib/posix_wrap/stdio.h:23,
                 from c:\mingw\include\libintl.h:314,
                 from ./include/grub/i18n.h:33,
                 from ./include/grub/misc.h:27,
                 from ./include/grub/list.h:25,
                 from ./include/grub/dl.h:28,
                 from grub-core/lib/libgcrypt-grub/cipher/rfc2268.c:3:
./include/grub/partition.h:106:3: note: previous implicit declaration of 'grub_l
ist_push' was here
   grub_list_push (GRUB_AS_LIST_P (&grub_partition_map_list),
   ^
list.h needs just ATTRIBUTE_ERROR from misc.h; split compiler features
into separate file grub/compiler.h and include it instead.
This commit is contained in:
Andrey Borzenkov 2014-01-18 21:22:57 +04:00
parent 1ecf96fcc4
commit f371dd5da8
12 changed files with 76 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
* include/grub/misc.h: Move macros for compiler features to ...
* include/grub/compiler.h: ... new file.
* include/grub/list.h: Include <grub/compiler.h> instead of <grub/misc.h>.
* grub-core/commands/fileXX.c: Include <grub/misc.h>.
* grub-core/efiemu/prepare.c: Include <grub/misc.h>.
* grub-core/loader/i386/xen_file.c: Include <grub/misc.h>.
* grub-core/loader/i386/xen_fileXX.c: Include <grub/misc.h>.
* grub-core/video/capture.c: Include <grub/misc.h>.
* include/grub/command.h: Include <grub/misc.h>.
* include/grub/dl.h: Include <grub/misc.h>.
* include/grub/procfs.h: Include <grub/misc.h>.
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
* configure.ac: Add support for BUILD_EXEEXT and use it ...