summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-02-18 23:17:07 +0000
committerThomas Martitz <kugel@rockbox.org>2011-02-18 23:17:07 +0000
commit1e391fbdbc4af5fbee0a88d2c6199fabfef4f534 (patch)
treea09732cb4430d8f761fce57731071b41081c0778
parent6d85de341928aef8178465c60122f3cbe76f5dd6 (diff)
downloadrockbox-1e391fbdbc4af5fbee0a88d2c6199fabfef4f534.zip
rockbox-1e391fbdbc4af5fbee0a88d2c6199fabfef4f534.tar.gz
rockbox-1e391fbdbc4af5fbee0a88d2c6199fabfef4f534.tar.bz2
rockbox-1e391fbdbc4af5fbee0a88d2c6199fabfef4f534.tar.xz
Fix yellows and checkwps.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29328 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/misc.c1
-rw-r--r--apps/misc.h1
-rw-r--r--firmware/export/thread.h2
-rw-r--r--firmware/thread.c2
-rwxr-xr-xtools/configure2
5 files changed, 5 insertions, 3 deletions
diff --git a/apps/misc.c b/apps/misc.c
index b2f1df5..e049663 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -26,6 +26,7 @@
#include "string-extra.h"
#include "config.h"
#include "misc.h"
+#include "system.h"
#include "lcd.h"
#include "file.h"
#include "filefuncs.h"
diff --git a/apps/misc.h b/apps/misc.h
index fa66956..1022af4 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -24,7 +24,6 @@
#include <stdbool.h>
#include <inttypes.h>
#include "config.h"
-#include "system.h"
#include "screen_access.h"
extern const unsigned char * const byte_units[];
diff --git a/firmware/export/thread.h b/firmware/export/thread.h
index 4f7631c..ba49951 100644
--- a/firmware/export/thread.h
+++ b/firmware/export/thread.h
@@ -150,7 +150,7 @@ struct regs
uint32_t start; /* 44 - Thread start address, or NULL when started */
};
#endif /* CONFIG_CPU */
-#elif (CONFIG_PLATFORM & PLATFORM_HOSTED)
+#elif (CONFIG_PLATFORM & PLATFORM_HOSTED) || defined(__PCTOOL__)
#ifndef HAVE_SDL_THREADS
struct regs
{
diff --git a/firmware/thread.c b/firmware/thread.c
index a81f56c..bfbaf46 100644
--- a/firmware/thread.c
+++ b/firmware/thread.c
@@ -2385,7 +2385,7 @@ void thread_get_name(char *buffer, int size,
const char *fmt = "%s";
if (name == NULL IF_COP(|| name == THREAD_DESTRUCT) || *name == '\0')
{
- name = (const char *)(unsigned int)thread->id;
+ name = (const char *)(uintptr_t)thread->id;
fmt = "%04lX";
}
snprintf(buffer, size, fmt, name);
diff --git a/tools/configure b/tools/configure
index 889012a..9ecad19 100755
--- a/tools/configure
+++ b/tools/configure
@@ -170,7 +170,9 @@ check_sigaltstack() {
#include <signal.h>
int main(int argc, char **argv)
{
+#ifndef NULL
#define NULL (void*)0
+#endif
sigaltstack(NULL, NULL);
return 0;
}