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

* include/grub/misc.h (ATTRIBUTE_ERROR): Make into noreturn attribute
	on older compiler.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-28 17:45:53 +02:00
parent 037f6d9060
commit 4a5a3c4abc
3 changed files with 7 additions and 2 deletions

View file

@ -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> 2012-05-28 Vladimir Serbinenko <phcoder@gmail.com>
* util/getroot.c (grub_util_biosdisk_get_grub_dev) [__APPLE__]: * util/getroot.c (grub_util_biosdisk_get_grub_dev) [__APPLE__]:

View file

@ -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", grub_fatal ("error:%s:%u: bad type cast between incompatible grub types",
file, line); file, line);
return 0;
} }
#define grub_bad_type_cast() grub_bad_type_cast_real(__LINE__, GRUB_FILE) #define grub_bad_type_cast() grub_bad_type_cast_real(__LINE__, GRUB_FILE)

View file

@ -39,7 +39,7 @@
# define ATTRIBUTE_ERROR(msg) \ # define ATTRIBUTE_ERROR(msg) \
__attribute__ ((__error__ (msg))) __attribute__ ((__error__ (msg)))
#else #else
# define ATTRIBUTE_ERROR(msg) # define ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
#endif #endif
#define ALIGN_UP(addr, align) \ #define ALIGN_UP(addr, align) \