fix include loop on MinGW due to libintl.h pulling stdio.h
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:
parent
1ecf96fcc4
commit
f371dd5da8
12 changed files with 76 additions and 30 deletions
14
ChangeLog
14
ChangeLog
|
@ -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>
|
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
|
||||||
|
|
||||||
* configure.ac: Add support for BUILD_EXEEXT and use it ...
|
* configure.ac: Add support for BUILD_EXEEXT and use it ...
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
#include <grub/fileid.h>
|
#include <grub/fileid.h>
|
||||||
#include <grub/elfload.h>
|
#include <grub/elfload.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
|
||||||
#pragma GCC diagnostic ignored "-Wcast-align"
|
#pragma GCC diagnostic ignored "-Wcast-align"
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <grub/err.h>
|
#include <grub/err.h>
|
||||||
#include <grub/mm.h>
|
#include <grub/mm.h>
|
||||||
#include <grub/types.h>
|
#include <grub/types.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
#include <grub/efiemu/efiemu.h>
|
#include <grub/efiemu/efiemu.h>
|
||||||
#include <grub/crypto.h>
|
#include <grub/crypto.h>
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
#include <grub/xen_file.h>
|
#include <grub/xen_file.h>
|
||||||
#include <grub/i386/linux.h>
|
#include <grub/i386/linux.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
|
||||||
grub_elf_t
|
grub_elf_t
|
||||||
grub_xen_file (grub_file_t file)
|
grub_xen_file (grub_file_t file)
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <grub/xen_file.h>
|
#include <grub/xen_file.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
|
||||||
static grub_err_t
|
static grub_err_t
|
||||||
parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi,
|
parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi,
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#include <grub/video.h>
|
#include <grub/video.h>
|
||||||
#include <grub/video_fb.h>
|
#include <grub/video_fb.h>
|
||||||
#include <grub/mm.h>
|
#include <grub/mm.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
|
||||||
static struct
|
static struct
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include <grub/symbol.h>
|
#include <grub/symbol.h>
|
||||||
#include <grub/err.h>
|
#include <grub/err.h>
|
||||||
#include <grub/list.h>
|
#include <grub/list.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
|
|
||||||
typedef enum grub_command_flags
|
typedef enum grub_command_flags
|
||||||
{
|
{
|
||||||
|
|
51
include/grub/compiler.h
Normal file
51
include/grub/compiler.h
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
/* compiler.h - macros for various compiler features */
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2002,2003,2005,2006,2007,2008,2009,2010,2014 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GRUB is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef GRUB_COMPILER_HEADER
|
||||||
|
#define GRUB_COMPILER_HEADER 1
|
||||||
|
|
||||||
|
/* GCC version checking borrowed from glibc. */
|
||||||
|
#if defined(__GNUC__) && defined(__GNUC_MINOR__)
|
||||||
|
# define GNUC_PREREQ(maj,min) \
|
||||||
|
((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
|
||||||
|
#else
|
||||||
|
# define GNUC_PREREQ(maj,min) 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Does this compiler support compile-time error attributes? */
|
||||||
|
#if GNUC_PREREQ(4,3)
|
||||||
|
# define ATTRIBUTE_ERROR(msg) \
|
||||||
|
__attribute__ ((__error__ (msg)))
|
||||||
|
#else
|
||||||
|
# define ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if GNUC_PREREQ(4,4)
|
||||||
|
# define GNU_PRINTF gnu_printf
|
||||||
|
#else
|
||||||
|
# define GNU_PRINTF printf
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if GNUC_PREREQ(3,4)
|
||||||
|
# define WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
|
||||||
|
#else
|
||||||
|
# define WARN_UNUSED_RESULT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* ! GRUB_COMPILER_HEADER */
|
|
@ -26,6 +26,7 @@
|
||||||
#include <grub/types.h>
|
#include <grub/types.h>
|
||||||
#include <grub/elf.h>
|
#include <grub/elf.h>
|
||||||
#include <grub/list.h>
|
#include <grub/list.h>
|
||||||
|
#include <grub/misc.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -21,8 +21,8 @@
|
||||||
#define GRUB_LIST_HEADER 1
|
#define GRUB_LIST_HEADER 1
|
||||||
|
|
||||||
#include <grub/symbol.h>
|
#include <grub/symbol.h>
|
||||||
#include <grub/types.h>
|
#include <grub/err.h>
|
||||||
#include <grub/misc.h>
|
#include <grub/compiler.h>
|
||||||
|
|
||||||
struct grub_list
|
struct grub_list
|
||||||
{
|
{
|
||||||
|
|
|
@ -25,34 +25,7 @@
|
||||||
#include <grub/symbol.h>
|
#include <grub/symbol.h>
|
||||||
#include <grub/err.h>
|
#include <grub/err.h>
|
||||||
#include <grub/i18n.h>
|
#include <grub/i18n.h>
|
||||||
|
#include <grub/compiler.h>
|
||||||
/* GCC version checking borrowed from glibc. */
|
|
||||||
#if defined(__GNUC__) && defined(__GNUC_MINOR__)
|
|
||||||
# define GNUC_PREREQ(maj,min) \
|
|
||||||
((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
|
|
||||||
#else
|
|
||||||
# define GNUC_PREREQ(maj,min) 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Does this compiler support compile-time error attributes? */
|
|
||||||
#if GNUC_PREREQ(4,3)
|
|
||||||
# define ATTRIBUTE_ERROR(msg) \
|
|
||||||
__attribute__ ((__error__ (msg)))
|
|
||||||
#else
|
|
||||||
# define ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if GNUC_PREREQ(4,4)
|
|
||||||
# define GNU_PRINTF gnu_printf
|
|
||||||
#else
|
|
||||||
# define GNU_PRINTF printf
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if GNUC_PREREQ(3,4)
|
|
||||||
# define WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
|
|
||||||
#else
|
|
||||||
# define WARN_UNUSED_RESULT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ALIGN_UP(addr, align) \
|
#define ALIGN_UP(addr, align) \
|
||||||
((addr + (typeof (addr)) align - 1) & ~((typeof (addr)) align - 1))
|
((addr + (typeof (addr)) align - 1) & ~((typeof (addr)) align - 1))
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#define GRUB_PROCFS_HEADER 1
|
#define GRUB_PROCFS_HEADER 1
|
||||||
|
|
||||||
#include <grub/list.h>
|
#include <grub/list.h>
|
||||||
|
#include <grub/types.h>
|
||||||
|
|
||||||
struct grub_procfs_entry
|
struct grub_procfs_entry
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue