diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-02-18 23:17:07 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-02-18 23:17:07 +0000 |
commit | 1e391fbdbc4af5fbee0a88d2c6199fabfef4f534 (patch) | |
tree | a09732cb4430d8f761fce57731071b41081c0778 | |
parent | 6d85de341928aef8178465c60122f3cbe76f5dd6 (diff) | |
download | rockbox-1e391fbdbc4af5fbee0a88d2c6199fabfef4f534.tar.gz rockbox-1e391fbdbc4af5fbee0a88d2c6199fabfef4f534.zip |
Fix yellows and checkwps.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29328 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/misc.c | 1 | ||||
-rw-r--r-- | apps/misc.h | 1 | ||||
-rw-r--r-- | firmware/export/thread.h | 2 | ||||
-rw-r--r-- | firmware/thread.c | 2 | ||||
-rwxr-xr-x | tools/configure | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/apps/misc.c b/apps/misc.c index b2f1df52f3..e0496633e4 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "string-extra.h" | 26 | #include "string-extra.h" |
27 | #include "config.h" | 27 | #include "config.h" |
28 | #include "misc.h" | 28 | #include "misc.h" |
29 | #include "system.h" | ||
29 | #include "lcd.h" | 30 | #include "lcd.h" |
30 | #include "file.h" | 31 | #include "file.h" |
31 | #include "filefuncs.h" | 32 | #include "filefuncs.h" |
diff --git a/apps/misc.h b/apps/misc.h index fa66956800..1022af4e93 100644 --- a/apps/misc.h +++ b/apps/misc.h | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | #include <inttypes.h> | 25 | #include <inttypes.h> |
26 | #include "config.h" | 26 | #include "config.h" |
27 | #include "system.h" | ||
28 | #include "screen_access.h" | 27 | #include "screen_access.h" |
29 | 28 | ||
30 | extern const unsigned char * const byte_units[]; | 29 | extern const unsigned char * const byte_units[]; |
diff --git a/firmware/export/thread.h b/firmware/export/thread.h index 4f7631cebd..ba49951af6 100644 --- a/firmware/export/thread.h +++ b/firmware/export/thread.h | |||
@@ -150,7 +150,7 @@ struct regs | |||
150 | uint32_t start; /* 44 - Thread start address, or NULL when started */ | 150 | uint32_t start; /* 44 - Thread start address, or NULL when started */ |
151 | }; | 151 | }; |
152 | #endif /* CONFIG_CPU */ | 152 | #endif /* CONFIG_CPU */ |
153 | #elif (CONFIG_PLATFORM & PLATFORM_HOSTED) | 153 | #elif (CONFIG_PLATFORM & PLATFORM_HOSTED) || defined(__PCTOOL__) |
154 | #ifndef HAVE_SDL_THREADS | 154 | #ifndef HAVE_SDL_THREADS |
155 | struct regs | 155 | struct regs |
156 | { | 156 | { |
diff --git a/firmware/thread.c b/firmware/thread.c index a81f56cdfe..bfbaf462a6 100644 --- a/firmware/thread.c +++ b/firmware/thread.c | |||
@@ -2385,7 +2385,7 @@ void thread_get_name(char *buffer, int size, | |||
2385 | const char *fmt = "%s"; | 2385 | const char *fmt = "%s"; |
2386 | if (name == NULL IF_COP(|| name == THREAD_DESTRUCT) || *name == '\0') | 2386 | if (name == NULL IF_COP(|| name == THREAD_DESTRUCT) || *name == '\0') |
2387 | { | 2387 | { |
2388 | name = (const char *)(unsigned int)thread->id; | 2388 | name = (const char *)(uintptr_t)thread->id; |
2389 | fmt = "%04lX"; | 2389 | fmt = "%04lX"; |
2390 | } | 2390 | } |
2391 | snprintf(buffer, size, fmt, name); | 2391 | snprintf(buffer, size, fmt, name); |
diff --git a/tools/configure b/tools/configure index 889012ab78..9ecad19a31 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -170,7 +170,9 @@ check_sigaltstack() { | |||
170 | #include <signal.h> | 170 | #include <signal.h> |
171 | int main(int argc, char **argv) | 171 | int main(int argc, char **argv) |
172 | { | 172 | { |
173 | #ifndef NULL | ||
173 | #define NULL (void*)0 | 174 | #define NULL (void*)0 |
175 | #endif | ||
174 | sigaltstack(NULL, NULL); | 176 | sigaltstack(NULL, NULL); |
175 | return 0; | 177 | return 0; |
176 | } | 178 | } |