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
This commit is contained in:
parent
89dcb1c984
commit
ded525e466
4 changed files with 7 additions and 8 deletions
|
@ -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 .. */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue