diff options
| -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 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; } |