diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-08-27 12:38:25 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-08-27 12:38:25 +0000 |
| commit | 2c2e261648d5ae1befe5c4f269a655cc06b6e1e9 (patch) | |
| tree | 16ea536a547deb252276c29d34eeee08f029866f /firmware/include | |
| parent | 79798ff5f30dea7419f360e197763abb3b46259a (diff) | |
Use system headers a bit more: use host's fcntl.h for O_RDONLY etc.
Removes the need to fix up those in the simulator.
Also work around some posix-mingw incompatibilities (e.g. getcwd()).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27904 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/include')
| -rw-r--r-- | firmware/include/file.h | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/firmware/include/file.h b/firmware/include/file.h index a9d1d05a11..7799f3d625 100644 --- a/firmware/include/file.h +++ b/firmware/include/file.h @@ -25,31 +25,19 @@ #include <sys/types.h> #include "config.h" #include "gcc_extensions.h" +#include <fcntl.h> +#ifdef WIN32 +/* this has SEEK_SET et al */ +#include <stdio.h> +#endif + #undef MAX_PATH /* this avoids problems when building simulator */ #define MAX_PATH 260 #define MAX_OPEN_FILES 11 -#ifndef SEEK_SET -#define SEEK_SET 0 -#endif -#ifndef SEEK_CUR -#define SEEK_CUR 1 -#endif -#ifndef SEEK_END -#define SEEK_END 2 -#endif - -#ifndef O_RDONLY -#define O_RDONLY 0 -#define O_WRONLY 1 -#define O_RDWR 2 -#define O_CREAT 4 -#define O_APPEND 8 -#define O_TRUNC 0x10 -#endif - -#if (CONFIG_PLATFORM & PLATFORM_HOSTED) && !defined(PLUGIN) && !defined(CODEC) +#if !defined(PLUGIN) && !defined(CODEC) +#if (CONFIG_PLATFORM & PLATFORM_HOSTED) #define open(x, ...) sim_open(x, __VA_ARGS__) #define creat(x,m) sim_creat(x,m) #define remove(x) sim_remove(x) @@ -96,4 +84,5 @@ extern int ftruncate(int fd, off_t length); extern off_t filesize(int fd); extern int release_files(int volume); int fdprintf (int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3); +#endif /* !CODEC && !PLUGIN */ #endif |