From 921ac8d6dde6df60cce9346232762794fb9efa05 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 2 Dec 2010 21:20:30 +0000 Subject: 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 --- firmware/libc/sscanf.c | 17 +---------------- firmware/target/hosted/sdl/thread-sdl.c | 4 ++-- 2 files changed, 3 insertions(+), 18 deletions(-) (limited to 'firmware') 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 @@ #include #include #include - -static inline bool isspace(char c) -{ - return (c == ' ') || (c == '\t') || (c == '\n'); -} - -static inline bool isdigit(char c) -{ - return (c >= '0') && (c <= '9'); -} - -static inline bool isxdigit(char c) -{ - return ((c >= '0') && (c <= '9')) - || ((c >= 'a') && (c <= 'f')) || ((c >= 'A') && (c <= 'F')); -} +#include static int parse_dec(int (*peek)(void *userp), 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) remove_thread(THREAD_ID_CURRENT); /* This should never and must never be reached - if it is, the * state is corrupted */ - THREAD_PANICF("thread_exit->K:*R", - thread_id_entry(THREAD_ID_CURRENT)); + THREAD_PANICF("thread_exit->K:*R (ID: %d)", + thread_id_entry(THREAD_ID_CURRENT)->id); while (1); } -- cgit v1.2.3