dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch

28f7f8
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
39700a
From: Andrey Borzenkov <arvidjaar@gmail.com>
39700a
Date: Sat, 18 Jan 2014 21:22:57 +0400
28f7f8
Subject: [PATCH] fix include loop on MinGW due to libintl.h pulling stdio.h
39700a
39700a
In file included from ./include/grub/dl.h:23:0,
39700a
                 from grub-core/lib/libgcrypt-grub/cipher/rfc2268.c:3:
39700a
./include/grub/list.h:34:18: warning: conflicting types for 'grub_list_push' [en
39700a
abled by default]
39700a
 void EXPORT_FUNC(grub_list_push) (grub_list_t *head, grub_list_t item);
39700a
                  ^
39700a
./include/grub/symbol.h:68:25: note: in definition of macro 'EXPORT_FUNC'
39700a
 # define EXPORT_FUNC(x) x
39700a
                         ^
39700a
In file included from ./include/grub/fs.h:30:0,
39700a
                 from ./include/grub/file.h:25,
39700a
                 from ./grub-core/lib/posix_wrap/stdio.h:23,
39700a
                 from c:\mingw\include\libintl.h:314,
39700a
                 from ./include/grub/i18n.h:33,
39700a
                 from ./include/grub/misc.h:27,
39700a
                 from ./include/grub/list.h:25,
39700a
                 from ./include/grub/dl.h:28,
39700a
                 from grub-core/lib/libgcrypt-grub/cipher/rfc2268.c:3:
39700a
./include/grub/partition.h:106:3: note: previous implicit declaration of 'grub_l
39700a
ist_push' was here
39700a
   grub_list_push (GRUB_AS_LIST_P (&grub_partition_map_list),
39700a
   ^
39700a
list.h needs just ATTRIBUTE_ERROR from misc.h; split compiler features
39700a
into separate file grub/compiler.h and include it instead.
39700a
---
39700a
 grub-core/commands/fileXX.c        |  1 +
39700a
 grub-core/efiemu/prepare.c         |  1 +
39700a
 grub-core/loader/i386/xen_file.c   |  1 +
39700a
 grub-core/loader/i386/xen_fileXX.c |  1 +
39700a
 grub-core/video/capture.c          |  1 +
39700a
 include/grub/command.h             |  1 +
39700a
 include/grub/compiler.h            | 51 ++++++++++++++++++++++++++++++++++++++
39700a
 include/grub/dl.h                  |  1 +
39700a
 include/grub/list.h                |  4 +--
39700a
 include/grub/misc.h                | 29 +---------------------
39700a
 include/grub/procfs.h              |  1 +
28f7f8
 ChangeLog                          | 14 +++++++++++
39700a
 12 files changed, 76 insertions(+), 30 deletions(-)
39700a
 create mode 100644 include/grub/compiler.h
39700a
39700a
diff --git a/grub-core/commands/fileXX.c b/grub-core/commands/fileXX.c
28f7f8
index c9857ff67b1..58e1094c68b 100644
39700a
--- a/grub-core/commands/fileXX.c
39700a
+++ b/grub-core/commands/fileXX.c
39700a
@@ -18,6 +18,7 @@
39700a
 
39700a
 #include <grub/fileid.h>
39700a
 #include <grub/elfload.h>
39700a
+#include <grub/misc.h>
39700a
 
39700a
 #pragma GCC diagnostic ignored "-Wcast-align"
39700a
 
39700a
diff --git a/grub-core/efiemu/prepare.c b/grub-core/efiemu/prepare.c
28f7f8
index fb1b25d17f2..84c3368a82c 100644
39700a
--- a/grub-core/efiemu/prepare.c
39700a
+++ b/grub-core/efiemu/prepare.c
39700a
@@ -21,6 +21,7 @@
39700a
 #include <grub/err.h>
39700a
 #include <grub/mm.h>
39700a
 #include <grub/types.h>
39700a
+#include <grub/misc.h>
39700a
 #include <grub/efiemu/efiemu.h>
39700a
 #include <grub/crypto.h>
39700a
 
39700a
diff --git a/grub-core/loader/i386/xen_file.c b/grub-core/loader/i386/xen_file.c
28f7f8
index ebbf6aa11ba..ff23235f064 100644
39700a
--- a/grub-core/loader/i386/xen_file.c
39700a
+++ b/grub-core/loader/i386/xen_file.c
39700a
@@ -18,6 +18,7 @@
39700a
 
39700a
 #include <grub/xen_file.h>
39700a
 #include <grub/i386/linux.h>
39700a
+#include <grub/misc.h>
39700a
 
39700a
 grub_elf_t
39700a
 grub_xen_file (grub_file_t file)
39700a
diff --git a/grub-core/loader/i386/xen_fileXX.c b/grub-core/loader/i386/xen_fileXX.c
28f7f8
index 6df00157629..73a5f90fdb9 100644
39700a
--- a/grub-core/loader/i386/xen_fileXX.c
39700a
+++ b/grub-core/loader/i386/xen_fileXX.c
39700a
@@ -17,6 +17,7 @@
39700a
  */
39700a
 
39700a
 #include <grub/xen_file.h>
39700a
+#include <grub/misc.h>
39700a
 
39700a
 static grub_err_t
39700a
 parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi,
39700a
diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c
28f7f8
index 67c8edde824..4f83c744116 100644
39700a
--- a/grub-core/video/capture.c
39700a
+++ b/grub-core/video/capture.c
39700a
@@ -4,6 +4,7 @@
39700a
 #include <grub/video.h>
39700a
 #include <grub/video_fb.h>
39700a
 #include <grub/mm.h>
39700a
+#include <grub/misc.h>
39700a
 
39700a
 static struct
39700a
 {
39700a
diff --git a/include/grub/command.h b/include/grub/command.h
28f7f8
index 8705a635519..eee4e847ee4 100644
39700a
--- a/include/grub/command.h
39700a
+++ b/include/grub/command.h
39700a
@@ -22,6 +22,7 @@
39700a
 #include <grub/symbol.h>
39700a
 #include <grub/err.h>
39700a
 #include <grub/list.h>
39700a
+#include <grub/misc.h>
39700a
 
39700a
 typedef enum grub_command_flags
39700a
   {
39700a
diff --git a/include/grub/compiler.h b/include/grub/compiler.h
39700a
new file mode 100644
28f7f8
index 00000000000..c9e1d7a73dc
39700a
--- /dev/null
39700a
+++ b/include/grub/compiler.h
39700a
@@ -0,0 +1,51 @@
39700a
+/* compiler.h - macros for various compiler features */
39700a
+/*
39700a
+ *  GRUB  --  GRand Unified Bootloader
39700a
+ *  Copyright (C) 2002,2003,2005,2006,2007,2008,2009,2010,2014  Free Software Foundation, Inc.
39700a
+ *
39700a
+ *  GRUB is free software: you can redistribute it and/or modify
39700a
+ *  it under the terms of the GNU General Public License as published by
39700a
+ *  the Free Software Foundation, either version 3 of the License, or
39700a
+ *  (at your option) any later version.
39700a
+ *
39700a
+ *  GRUB is distributed in the hope that it will be useful,
39700a
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
39700a
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
39700a
+ *  GNU General Public License for more details.
39700a
+ *
39700a
+ *  You should have received a copy of the GNU General Public License
39700a
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
39700a
+ */
39700a
+
39700a
+#ifndef GRUB_COMPILER_HEADER
39700a
+#define GRUB_COMPILER_HEADER	1
39700a
+
39700a
+/* GCC version checking borrowed from glibc. */
39700a
+#if defined(__GNUC__) && defined(__GNUC_MINOR__)
39700a
+#  define GNUC_PREREQ(maj,min) \
39700a
+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
39700a
+#else
39700a
+#  define GNUC_PREREQ(maj,min) 0
39700a
+#endif
39700a
+
39700a
+/* Does this compiler support compile-time error attributes? */
39700a
+#if GNUC_PREREQ(4,3)
39700a
+#  define ATTRIBUTE_ERROR(msg) \
39700a
+	__attribute__ ((__error__ (msg)))
39700a
+#else
39700a
+#  define ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
39700a
+#endif
39700a
+
39700a
+#if GNUC_PREREQ(4,4)
39700a
+#  define GNU_PRINTF gnu_printf
39700a
+#else
39700a
+#  define GNU_PRINTF printf
39700a
+#endif
39700a
+
39700a
+#if GNUC_PREREQ(3,4)
39700a
+#  define WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
39700a
+#else
39700a
+#  define WARN_UNUSED_RESULT
39700a
+#endif
39700a
+
39700a
+#endif /* ! GRUB_COMPILER_HEADER */
39700a
diff --git a/include/grub/dl.h b/include/grub/dl.h
28f7f8
index d29a899f52c..9562fa6634c 100644
39700a
--- a/include/grub/dl.h
39700a
+++ b/include/grub/dl.h
39700a
@@ -26,6 +26,7 @@
39700a
 #include <grub/types.h>
39700a
 #include <grub/elf.h>
39700a
 #include <grub/list.h>
39700a
+#include <grub/misc.h>
39700a
 #endif
39700a
 
39700a
 /*
39700a
diff --git a/include/grub/list.h b/include/grub/list.h
28f7f8
index edd20adfdb2..d170ff6da02 100644
39700a
--- a/include/grub/list.h
39700a
+++ b/include/grub/list.h
39700a
@@ -21,8 +21,8 @@
39700a
 #define GRUB_LIST_HEADER 1
39700a
 
39700a
 #include <grub/symbol.h>
39700a
-#include <grub/types.h>
39700a
-#include <grub/misc.h>
39700a
+#include <grub/err.h>
39700a
+#include <grub/compiler.h>
39700a
 
39700a
 struct grub_list
39700a
 {
39700a
diff --git a/include/grub/misc.h b/include/grub/misc.h
28f7f8
index 2cf74b55006..c6cd4564d86 100644
39700a
--- a/include/grub/misc.h
39700a
+++ b/include/grub/misc.h
39700a
@@ -25,34 +25,7 @@
39700a
 #include <grub/symbol.h>
39700a
 #include <grub/err.h>
39700a
 #include <grub/i18n.h>
39700a
-
39700a
-/* GCC version checking borrowed from glibc. */
39700a
-#if defined(__GNUC__) && defined(__GNUC_MINOR__)
39700a
-#  define GNUC_PREREQ(maj,min) \
39700a
-	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
39700a
-#else
39700a
-#  define GNUC_PREREQ(maj,min) 0
39700a
-#endif
39700a
-
39700a
-/* Does this compiler support compile-time error attributes? */
39700a
-#if GNUC_PREREQ(4,3)
39700a
-#  define ATTRIBUTE_ERROR(msg) \
39700a
-	__attribute__ ((__error__ (msg)))
39700a
-#else
39700a
-#  define ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
39700a
-#endif
39700a
-
39700a
-#if GNUC_PREREQ(4,4)
39700a
-#  define GNU_PRINTF gnu_printf
39700a
-#else
39700a
-#  define GNU_PRINTF printf
39700a
-#endif
39700a
-
39700a
-#if GNUC_PREREQ(3,4)
39700a
-#  define WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
39700a
-#else
39700a
-#  define WARN_UNUSED_RESULT
39700a
-#endif
39700a
+#include <grub/compiler.h>
39700a
 
39700a
 #define ALIGN_UP(addr, align) \
39700a
 	((addr + (typeof (addr)) align - 1) & ~((typeof (addr)) align - 1))
39700a
diff --git a/include/grub/procfs.h b/include/grub/procfs.h
28f7f8
index d393da77f91..8cc331d946f 100644
39700a
--- a/include/grub/procfs.h
39700a
+++ b/include/grub/procfs.h
39700a
@@ -20,6 +20,7 @@
39700a
 #define GRUB_PROCFS_HEADER	1
39700a
 
39700a
 #include <grub/list.h>
39700a
+#include <grub/types.h>
39700a
 
39700a
 struct grub_procfs_entry
39700a
 {
28f7f8
diff --git a/ChangeLog b/ChangeLog
28f7f8
index dad2da2faef..dad469b43b1 100644
28f7f8
--- a/ChangeLog
28f7f8
+++ b/ChangeLog
28f7f8
@@ -1,3 +1,17 @@
28f7f8
+2014-01-18  Andrey Borzenkov <arvidjaar@gmail.com>
28f7f8
+
28f7f8
+	* include/grub/misc.h: Move macros for compiler features to ...
28f7f8
+	* include/grub/compiler.h: ... new file.
28f7f8
+	* include/grub/list.h: Include <grub/compiler.h> instead of <grub/misc.h>.
28f7f8
+	* grub-core/commands/fileXX.c: Include <grub/misc.h>.
28f7f8
+	* grub-core/efiemu/prepare.c: Include <grub/misc.h>.
28f7f8
+	* grub-core/loader/i386/xen_file.c: Include <grub/misc.h>.
28f7f8
+	* grub-core/loader/i386/xen_fileXX.c: Include <grub/misc.h>.
28f7f8
+	* grub-core/video/capture.c: Include <grub/misc.h>.
28f7f8
+	* include/grub/command.h: Include <grub/misc.h>.
28f7f8
+	* include/grub/dl.h: Include <grub/misc.h>.
28f7f8
+	* include/grub/procfs.h: Include <grub/misc.h>.
28f7f8
+
28f7f8
 2014-01-18  Andrey Borzenkov <arvidjaar@gmail.com>
28f7f8
 
28f7f8
 	* configure.ac: Add support for BUILD_EXEEXT and use it ...