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 /firmware | |
| parent | ab4a16276306c7739d17f9abddc736ce45b58e7d (diff) | |
| download | rockbox-6ac64206f3f06e8860b77488d9dc70bc8ab659af.zip rockbox-6ac64206f3f06e8860b77488d9dc70bc8ab659af.tar.gz rockbox-6ac64206f3f06e8860b77488d9dc70bc8ab659af.tar.bz2 rockbox-6ac64206f3f06e8860b77488d9dc70bc8ab659af.tar.xz | |
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
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/include/file.h | 6 | ||||
| -rw-r--r-- | firmware/logf.c | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/firmware/include/file.h b/firmware/include/file.h index 1a43c6a..f66cc6c 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 7d4ffe2..b68f8a1 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" |