diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-08-12 13:38:25 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-08-12 13:38:25 +0000 |
| commit | 0e2286f226c8ce66adb846995eb1bf0b4d92a649 (patch) | |
| tree | ae47cfb8e2440b0b220e57e4c894390b6c1efd7a /bootloader | |
| parent | 70ebe46d74dbb10160a878cdb120c9b3e7a8e30c (diff) | |
| download | rockbox-0e2286f226c8ce66adb846995eb1bf0b4d92a649.zip rockbox-0e2286f226c8ce66adb846995eb1bf0b4d92a649.tar.gz rockbox-0e2286f226c8ce66adb846995eb1bf0b4d92a649.tar.bz2 rockbox-0e2286f226c8ce66adb846995eb1bf0b4d92a649.tar.xz | |
Introduce NORETURN_ATTR wrapper for __attribute__((noreturn)), using this and a bit further cleanup in main gets rid of a warning when compiling for android.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27788 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
| -rw-r--r-- | bootloader/gigabeat-s.c | 3 | ||||
| -rw-r--r-- | bootloader/sansa_as3525.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c index b6db9e6..9c5ad93 100644 --- a/bootloader/gigabeat-s.c +++ b/bootloader/gigabeat-s.c @@ -22,6 +22,7 @@ #include "system.h" #include <stdio.h> #include "kernel.h" +#include "gcc_extensions.h" #include "string.h" #include "adc.h" #include "powermgmt.h" @@ -296,7 +297,7 @@ static void handle_untar(void) } /* Try to load the firmware and run it */ -static void __attribute__((noreturn)) handle_firmware_load(void) +static void NORETURN_ATTR handle_firmware_load(void) { int rc = load_firmware(load_buf, BOOTFILE, load_buf_size); diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c index d8dc3f3..140fa02 100644 --- a/bootloader/sansa_as3525.c +++ b/bootloader/sansa_as3525.c @@ -26,6 +26,7 @@ #include <system.h> #include <inttypes.h> #include "config.h" +#include "gcc_extensions.h" #include "lcd.h" #ifdef USE_ROCKBOX_USB #include "usb.h" @@ -70,7 +71,7 @@ static void usb_mode(void) } #endif /* USE_ROCKBOX_USB */ -void main(void) __attribute__((noreturn)); +void main(void) NORETURN_ATTR; void main(void) { unsigned char* loadbuffer; |