diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-09-01 22:06:03 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-09-01 22:06:03 +0000 |
| commit | a4264eb89a21a3c9cc765df76ce293cfd3e73a49 (patch) | |
| tree | d56cb8b8e73a18cdb883d6fb3f757a8203b60a31 | |
| parent | 4ada1ee44e4a22dc1a39a92bd6b88a664bdb8d77 (diff) | |
Redo previous commit to not break android builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27972 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/common/filefuncs.c | 5 | ||||
| -rw-r--r-- | tools/database/SOURCES | 1 | ||||
| -rw-r--r-- | uisimulator/common/io.c | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/firmware/common/filefuncs.c b/firmware/common/filefuncs.c index 21096dac3c..2e3894b2c4 100644 --- a/firmware/common/filefuncs.c +++ b/firmware/common/filefuncs.c @@ -54,7 +54,6 @@ int strip_volume(const char* name, char* namecopy) } #endif /* #ifdef HAVE_MULTIVOLUME */ -#ifndef __PCTOOL__ /* Test file existence, using dircache of possible */ bool file_exists(const char *file) { @@ -89,10 +88,10 @@ bool dir_exists(const char *path) return true; } -#endif /* __PCTOOL__ */ - +#if (CONFIG_PLATFORM & PLATFORM_NATIVE) struct dirinfo dir_get_info(DIR* parent, struct dirent *entry) { (void)parent; return entry->info; } +#endif diff --git a/tools/database/SOURCES b/tools/database/SOURCES index 0abfce61ff..e66ea603e1 100644 --- a/tools/database/SOURCES +++ b/tools/database/SOURCES @@ -8,7 +8,6 @@ database.c ../../apps/mp3data.c ../../apps/tagcache.c ../../firmware/common/crc32.c -../../firmware/common/filefuncs.c ../../firmware/common/strlcpy.c ../../firmware/common/strcasestr.c ../../firmware/common/structec.c diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c index f630ae49c8..b367eb14a1 100644 --- a/uisimulator/common/io.c +++ b/uisimulator/common/io.c @@ -347,6 +347,13 @@ struct sim_dirent *sim_readdir(MYDIR *dir) return &secret; } +struct dirinfo dir_get_info(DIR* parent, struct sim_dirent *entry) +{ + (void)parent; + return entry->info; +} + + void sim_closedir(MYDIR *dir) { free(dir->name); |