diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-12-02 21:20:30 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-12-02 21:20:30 +0000 |
commit | 921ac8d6dde6df60cce9346232762794fb9efa05 (patch) | |
tree | 7f33290eb2d388aa7ed49e4a4d362da1abb8492f /firmware | |
parent | 589d2110dc6d7d1104554062ac5f01246c7f8acf (diff) | |
download | rockbox-921ac8d6dde6df60cce9346232762794fb9efa05.tar.gz rockbox-921ac8d6dde6df60cce9346232762794fb9efa05.zip |
Change the gcc options for sdl builds to allow for gnu99 features, it needs some fixes in other places. Fixes test_mem compilation failure on cygwin.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28723 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/libc/sscanf.c | 17 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/thread-sdl.c | 4 |
2 files changed, 3 insertions, 18 deletions
diff --git a/firmware/libc/sscanf.c b/firmware/libc/sscanf.c index 5fbe81f3e0..5bb08d8268 100644 --- a/firmware/libc/sscanf.c +++ b/firmware/libc/sscanf.c | |||
@@ -1,22 +1,7 @@ | |||
1 | #include <stdarg.h> | 1 | #include <stdarg.h> |
2 | #include <string.h> | 2 | #include <string.h> |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | 4 | #include <ctype.h> | |
5 | static inline bool isspace(char c) | ||
6 | { | ||
7 | return (c == ' ') || (c == '\t') || (c == '\n'); | ||
8 | } | ||
9 | |||
10 | static inline bool isdigit(char c) | ||
11 | { | ||
12 | return (c >= '0') && (c <= '9'); | ||
13 | } | ||
14 | |||
15 | static inline bool isxdigit(char c) | ||
16 | { | ||
17 | return ((c >= '0') && (c <= '9')) | ||
18 | || ((c >= 'a') && (c <= 'f')) || ((c >= 'A') && (c <= 'F')); | ||
19 | } | ||
20 | 5 | ||
21 | static int parse_dec(int (*peek)(void *userp), | 6 | static int parse_dec(int (*peek)(void *userp), |
22 | void (*pop)(void *userp), | 7 | void (*pop)(void *userp), |
diff --git a/firmware/target/hosted/sdl/thread-sdl.c b/firmware/target/hosted/sdl/thread-sdl.c index 1a683911d7..83f1d1960d 100644 --- a/firmware/target/hosted/sdl/thread-sdl.c +++ b/firmware/target/hosted/sdl/thread-sdl.c | |||
@@ -632,8 +632,8 @@ void thread_exit(void) | |||
632 | remove_thread(THREAD_ID_CURRENT); | 632 | remove_thread(THREAD_ID_CURRENT); |
633 | /* This should never and must never be reached - if it is, the | 633 | /* This should never and must never be reached - if it is, the |
634 | * state is corrupted */ | 634 | * state is corrupted */ |
635 | THREAD_PANICF("thread_exit->K:*R", | 635 | THREAD_PANICF("thread_exit->K:*R (ID: %d)", |
636 | thread_id_entry(THREAD_ID_CURRENT)); | 636 | thread_id_entry(THREAD_ID_CURRENT)->id); |
637 | while (1); | 637 | while (1); |
638 | } | 638 | } |
639 | 639 | ||