* include/grub/list.h (grub_bad_type_cast_real): Remove return.

	* include/grub/misc.h (ATTRIBUTE_ERROR): Make into noreturn attribute
	on older compiler.

diff --git a/ChangeLog b/ChangeLog
index fbfd431d5b2f02e43579afe5348f034d63a619f9..67d67dc23dec2fb5247f6b424c0ccc1133050587 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/list.h (grub_bad_type_cast_real): Remove return.
+       * include/grub/misc.h (ATTRIBUTE_ERROR): Make into noreturn attribute
+       on older compiler.
+
 2012-05-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/getroot.c (grub_util_biosdisk_get_grub_dev) [__APPLE__]:

diff --git a/include/grub/list.h b/include/grub/list.h
index 9c4b8a3dfb0a034520a4798564199246d80e2b3e..cadb2d9f9d8470d6ec9977aa45419dd8ea054147 100644 (file)
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -45,7 +45,6 @@ grub_bad_type_cast_real (int line, const char *file)
 {
   grub_fatal ("error:%s:%u: bad type cast between incompatible grub types",
              file, line);
-  return 0;
 }
 
 #define grub_bad_type_cast() grub_bad_type_cast_real(__LINE__, GRUB_FILE)

diff --git a/include/grub/misc.h b/include/grub/misc.h
index 11a402fbf97353cf01c205c6952ba0b4043e5b0c..33e6b73ccf2c40c58c2ca4b2767eb7d5f4d8317f 100644 (file)
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -39,7 +39,7 @@
 #  define ATTRIBUTE_ERROR(msg) \
        __attribute__ ((__error__ (msg)))
 #else
-#  define ATTRIBUTE_ERROR(msg)
+#  define ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
 #endif
 
 #define ALIGN_UP(addr, align) \