From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 28 May 2012 15:45:53 +0000 (+0200)
Subject: 	* include/grub/list.h (grub_bad_type_cast_real): Remove return.
X-Git-Tag: 2.00~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a5a3c4abc6adece81074c30a145dda920824a4e;p=thirdparty%2Fgrub.git

	* 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 fbfd431d5..67d67dc23 100644
--- 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 9c4b8a3df..cadb2d9f9 100644
--- 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 11a402fbf..33e6b73cc 100644
--- 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) \