diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-09-08 21:26:36 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-09-08 21:26:36 +0000 |
| commit | ded525e4668fd630647273691556accccd329700 (patch) | |
| tree | 446a63de18800f2346901b51646d1e40b3930878 | |
| parent | 89dcb1c98440e9b1baec330e05e07b85d278e0f5 (diff) | |
Revert r27972 to fix FS#11610 (but in a way android builds still work).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28050 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/filetree.c | 2 | ||||
| -rw-r--r-- | firmware/common/filefuncs.c | 5 | ||||
| -rw-r--r-- | tools/database/SOURCES | 1 | ||||
| -rw-r--r-- | uisimulator/common/io.c | 7 |
4 files changed, 7 insertions, 8 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index 1dc510f8c7..9781f8396a 100644 --- a/apps/filetree.c +++ b/apps/filetree.c @@ -290,7 +290,9 @@ int ft_load(struct tree_context* c, const char* tempdir) if (!entry) break; + DEBUGF("aaa\n"); info = dir_get_info(dir, entry); + DEBUGF("ccc\n"); len = strlen((char *)entry->d_name); /* skip directories . and .. */ diff --git a/firmware/common/filefuncs.c b/firmware/common/filefuncs.c index 2e3894b2c4..19b8eff612 100644 --- a/firmware/common/filefuncs.c +++ b/firmware/common/filefuncs.c @@ -26,6 +26,7 @@ #include "file.h" #include "filefuncs.h" +#ifndef __PCTOOL__ #ifdef HAVE_MULTIVOLUME /* returns on which volume this is, and copies the reduced name (sortof a preprocessor for volume-decorated pathnames) */ @@ -88,7 +89,9 @@ bool dir_exists(const char *path) return true; } -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) +#endif /* __PCTOOL__ */ + +#if (CONFIG_PLATFORM & (PLATFORM_NATIVE|PLATFORM_SDL)) struct dirinfo dir_get_info(DIR* parent, struct dirent *entry) { (void)parent; diff --git a/tools/database/SOURCES b/tools/database/SOURCES index e66ea603e1..0abfce61ff 100644 --- a/tools/database/SOURCES +++ b/tools/database/SOURCES @@ -8,6 +8,7 @@ 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 e512af1c9f..56f1339fbc 100644 --- a/uisimulator/common/io.c +++ b/uisimulator/common/io.c @@ -342,13 +342,6 @@ 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); |