summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-05-06 22:17:34 +0000
committerThomas Martitz <kugel@rockbox.org>2010-05-06 22:17:34 +0000
commit6ac64206f3f06e8860b77488d9dc70bc8ab659af (patch)
treea5a43d1aae1fad29a55263101fde343dd5355d5b
parentab4a16276306c7739d17f9abddc736ce45b58e7d (diff)
downloadrockbox-6ac64206f3f06e8860b77488d9dc70bc8ab659af.tar.gz
rockbox-6ac64206f3f06e8860b77488d9dc70bc8ab659af.tar.bz2
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.h6
-rw-r--r--firmware/logf.c5
-rw-r--r--tools/database/SOURCES2
-rw-r--r--tools/database/database.make2
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 @@
#undef MAX_PATH /* this avoids problems when building simulator */
#define MAX_PATH 260
-#ifdef __PCTOOL__
-#include <fcntl.h>
-#else
#include <sys/types.h>
#include "_ansi.h"
@@ -88,7 +85,7 @@ static inline int creat(const char *pathname, mode_t mode)
(void)mode;
return file_creat(pathname);
}
-#if !defined(CODEC) && !defined(PLUGIN)
+#if !defined(CODEC) && !defined(PLUGIN) && !defined(__PCTOOL__)
#define open(x, y, ...) file_open(x,y)
#endif
#endif
@@ -100,4 +97,3 @@ extern off_t filesize(int fd);
extern int release_files(int volume);
int fdprintf (int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3);
#endif
-#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 @@
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
-#include <sprintf.h>
-#include <system.h>
-#include <font.h>
#include "config.h"
+#include "system.h"
+#include "font.h"
#include "lcd-remote.h"
#include "logf.h"
#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
../../apps/mp3data.c
../../apps/tagcache.c
../../firmware/common/crc32.c
-../../firmware/common/ctype.c
-../../firmware/common/errno.c
../../firmware/common/strlcpy.c
../../firmware/common/strcasestr.c
../../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`
OLDGCCOPTS:=$(GCCOPTS)
GCCOPTS+=-D__PCTOOL__ $(FIRMINC) $(SIMINCLUDES)
-LIBS=`$(SDLCONFIG) --libs`
+LIBS=`$(SDLCONFIG) --libs` -lc
ifneq ($(findstring MINGW,$(shell uname)),MINGW)
LIBS += -ldl
endif