diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-10-06 22:02:06 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-10-06 22:02:06 +0000 |
commit | d1a9e0c5884942b62b3f538007e2b56a8c221f05 (patch) | |
tree | 09d060f7e161824c36f90afcfa1fbeba4b745261 | |
parent | ee21a5322e6eba742f7824334c840408ce7e839d (diff) | |
download | rockbox-d1a9e0c5884942b62b3f538007e2b56a8c221f05.tar.gz rockbox-d1a9e0c5884942b62b3f538007e2b56a8c221f05.zip |
fix checkwps breakage caused by r229900
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22993 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/recorder/bmp.c | 3 | ||||
-rw-r--r-- | firmware/export/system.h | 3 | ||||
-rw-r--r-- | tools/checkwps/checkwps.h | 8 |
3 files changed, 2 insertions, 12 deletions
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c index b67615b840..4e8cdd70c5 100644 --- a/apps/recorder/bmp.c +++ b/apps/recorder/bmp.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <stdlib.h> | 42 | #include <stdlib.h> |
43 | #include <string.h> | 43 | #include <string.h> |
44 | #include "inttypes.h" | 44 | #include "inttypes.h" |
45 | #include "system.h" | ||
45 | #ifndef PLUGIN | 46 | #ifndef PLUGIN |
46 | #include "debug.h" | 47 | #include "debug.h" |
47 | #endif | 48 | #endif |
@@ -58,10 +59,8 @@ | |||
58 | #endif | 59 | #endif |
59 | #ifndef __PCTOOL__ | 60 | #ifndef __PCTOOL__ |
60 | #include "config.h" | 61 | #include "config.h" |
61 | #include "system.h" | ||
62 | #include "resize.h" | 62 | #include "resize.h" |
63 | #else | 63 | #else |
64 | #include "checkwps.h" | ||
65 | #undef DEBUGF | 64 | #undef DEBUGF |
66 | #define DEBUGF(...) | 65 | #define DEBUGF(...) |
67 | #endif | 66 | #endif |
diff --git a/firmware/export/system.h b/firmware/export/system.h index 196c20a33b..d1b5df546b 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h | |||
@@ -230,10 +230,9 @@ enum { | |||
230 | MAXMEMGUARD | 230 | MAXMEMGUARD |
231 | }; | 231 | }; |
232 | 232 | ||
233 | #ifndef SIMULATOR | 233 | #if !defined(SIMULATOR) && !defined(__PCTOOL__) |
234 | #include "system-target.h" | 234 | #include "system-target.h" |
235 | #else /* SIMULATOR */ | 235 | #else /* SIMULATOR */ |
236 | |||
237 | static inline uint16_t swap16(uint16_t value) | 236 | static inline uint16_t swap16(uint16_t value) |
238 | /* | 237 | /* |
239 | result[15..8] = value[ 7..0]; | 238 | result[15..8] = value[ 7..0]; |
diff --git a/tools/checkwps/checkwps.h b/tools/checkwps/checkwps.h index dd7da32776..fd494ce694 100644 --- a/tools/checkwps/checkwps.h +++ b/tools/checkwps/checkwps.h | |||
@@ -27,12 +27,4 @@ | |||
27 | 27 | ||
28 | #define SYSFONT_HEIGHT 8 | 28 | #define SYSFONT_HEIGHT 8 |
29 | 29 | ||
30 | #ifndef MIN | ||
31 | #define MIN(a, b) (((a)<(b))?(a):(b)) | ||
32 | #endif | ||
33 | |||
34 | #ifndef BIT_N | ||
35 | #define BIT_N(n) (1U << (n)) | ||
36 | #endif | ||
37 | |||
38 | #endif | 30 | #endif |