diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-05-06 22:17:34 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-05-06 22:17:34 +0000 |
commit | 6ac64206f3f06e8860b77488d9dc70bc8ab659af (patch) | |
tree | a5a43d1aae1fad29a55263101fde343dd5355d5b | |
parent | ab4a16276306c7739d17f9abddc736ce45b58e7d (diff) | |
download | rockbox-6ac64206f3f06e8860b77488d9dc70bc8ab659af.tar.gz rockbox-6ac64206f3f06e8860b77488d9dc70bc8ab659af.zip |
Revert r25854 which was bad for the database tool (I forgot it still needs the wrappers from uisimulator/common/io.c). Fix it so it works for both.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25856 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/include/file.h | 6 | ||||
-rw-r--r-- | firmware/logf.c | 5 | ||||
-rw-r--r-- | tools/database/SOURCES | 2 | ||||
-rw-r--r-- | tools/database/database.make | 2 |
4 files changed, 4 insertions, 11 deletions
diff --git a/firmware/include/file.h b/firmware/include/file.h index 1a43c6ad1d..f66cc6c60e 100644 --- a/firmware/include/file.h +++ b/firmware/include/file.h | |||
@@ -25,9 +25,6 @@ | |||
25 | #undef MAX_PATH /* this avoids problems when building simulator */ | 25 | #undef MAX_PATH /* this avoids problems when building simulator */ |
26 | #define MAX_PATH 260 | 26 | #define MAX_PATH 260 |
27 | 27 | ||
28 | #ifdef __PCTOOL__ | ||
29 | #include <fcntl.h> | ||
30 | #else | ||
31 | #include <sys/types.h> | 28 | #include <sys/types.h> |
32 | #include "_ansi.h" | 29 | #include "_ansi.h" |
33 | 30 | ||
@@ -88,7 +85,7 @@ static inline int creat(const char *pathname, mode_t mode) | |||
88 | (void)mode; | 85 | (void)mode; |
89 | return file_creat(pathname); | 86 | return file_creat(pathname); |
90 | } | 87 | } |
91 | #if !defined(CODEC) && !defined(PLUGIN) | 88 | #if !defined(CODEC) && !defined(PLUGIN) && !defined(__PCTOOL__) |
92 | #define open(x, y, ...) file_open(x,y) | 89 | #define open(x, y, ...) file_open(x,y) |
93 | #endif | 90 | #endif |
94 | #endif | 91 | #endif |
@@ -100,4 +97,3 @@ extern off_t filesize(int fd); | |||
100 | extern int release_files(int volume); | 97 | extern int release_files(int volume); |
101 | int fdprintf (int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3); | 98 | int fdprintf (int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3); |
102 | #endif | 99 | #endif |
103 | #endif | ||
diff --git a/firmware/logf.c b/firmware/logf.c index 7d4ffe24af..b68f8a1d26 100644 --- a/firmware/logf.c +++ b/firmware/logf.c | |||
@@ -29,10 +29,9 @@ | |||
29 | #include <string.h> | 29 | #include <string.h> |
30 | #include <stdio.h> | 30 | #include <stdio.h> |
31 | #include <stdarg.h> | 31 | #include <stdarg.h> |
32 | #include <sprintf.h> | ||
33 | #include <system.h> | ||
34 | #include <font.h> | ||
35 | #include "config.h" | 32 | #include "config.h" |
33 | #include "system.h" | ||
34 | #include "font.h" | ||
36 | #include "lcd-remote.h" | 35 | #include "lcd-remote.h" |
37 | #include "logf.h" | 36 | #include "logf.h" |
38 | #include "serial.h" | 37 | #include "serial.h" |
diff --git a/tools/database/SOURCES b/tools/database/SOURCES index 56bb9f1323..cef0e96eec 100644 --- a/tools/database/SOURCES +++ b/tools/database/SOURCES | |||
@@ -8,8 +8,6 @@ database.c | |||
8 | ../../apps/mp3data.c | 8 | ../../apps/mp3data.c |
9 | ../../apps/tagcache.c | 9 | ../../apps/tagcache.c |
10 | ../../firmware/common/crc32.c | 10 | ../../firmware/common/crc32.c |
11 | ../../firmware/common/ctype.c | ||
12 | ../../firmware/common/errno.c | ||
13 | ../../firmware/common/strlcpy.c | 11 | ../../firmware/common/strlcpy.c |
14 | ../../firmware/common/strcasestr.c | 12 | ../../firmware/common/strcasestr.c |
15 | ../../firmware/common/structec.c | 13 | ../../firmware/common/structec.c |
diff --git a/tools/database/database.make b/tools/database/database.make index 62b2e9f24c..54913d8d4a 100644 --- a/tools/database/database.make +++ b/tools/database/database.make | |||
@@ -40,7 +40,7 @@ GCCOPTS+=`$(SDLCONFIG) --cflags` | |||
40 | OLDGCCOPTS:=$(GCCOPTS) | 40 | OLDGCCOPTS:=$(GCCOPTS) |
41 | GCCOPTS+=-D__PCTOOL__ $(FIRMINC) $(SIMINCLUDES) | 41 | GCCOPTS+=-D__PCTOOL__ $(FIRMINC) $(SIMINCLUDES) |
42 | 42 | ||
43 | LIBS=`$(SDLCONFIG) --libs` | 43 | LIBS=`$(SDLCONFIG) --libs` -lc |
44 | ifneq ($(findstring MINGW,$(shell uname)),MINGW) | 44 | ifneq ($(findstring MINGW,$(shell uname)),MINGW) |
45 | LIBS += -ldl | 45 | LIBS += -ldl |
46 | endif | 46 | endif |