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) | |
download | rockbox-a4264eb89a21a3c9cc765df76ce293cfd3e73a49.tar.gz rockbox-a4264eb89a21a3c9cc765df76ce293cfd3e73a49.zip |
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) | |||
54 | } | 54 | } |
55 | #endif /* #ifdef HAVE_MULTIVOLUME */ | 55 | #endif /* #ifdef HAVE_MULTIVOLUME */ |
56 | 56 | ||
57 | #ifndef __PCTOOL__ | ||
58 | /* Test file existence, using dircache of possible */ | 57 | /* Test file existence, using dircache of possible */ |
59 | bool file_exists(const char *file) | 58 | bool file_exists(const char *file) |
60 | { | 59 | { |
@@ -89,10 +88,10 @@ bool dir_exists(const char *path) | |||
89 | return true; | 88 | return true; |
90 | } | 89 | } |
91 | 90 | ||
92 | #endif /* __PCTOOL__ */ | 91 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
93 | |||
94 | struct dirinfo dir_get_info(DIR* parent, struct dirent *entry) | 92 | struct dirinfo dir_get_info(DIR* parent, struct dirent *entry) |
95 | { | 93 | { |
96 | (void)parent; | 94 | (void)parent; |
97 | return entry->info; | 95 | return entry->info; |
98 | } | 96 | } |
97 | #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 | |||
8 | ../../apps/mp3data.c | 8 | ../../apps/mp3data.c |
9 | ../../apps/tagcache.c | 9 | ../../apps/tagcache.c |
10 | ../../firmware/common/crc32.c | 10 | ../../firmware/common/crc32.c |
11 | ../../firmware/common/filefuncs.c | ||
12 | ../../firmware/common/strlcpy.c | 11 | ../../firmware/common/strlcpy.c |
13 | ../../firmware/common/strcasestr.c | 12 | ../../firmware/common/strcasestr.c |
14 | ../../firmware/common/structec.c | 13 | ../../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) | |||
347 | return &secret; | 347 | return &secret; |
348 | } | 348 | } |
349 | 349 | ||
350 | struct dirinfo dir_get_info(DIR* parent, struct sim_dirent *entry) | ||
351 | { | ||
352 | (void)parent; | ||
353 | return entry->info; | ||
354 | } | ||
355 | |||
356 | |||
350 | void sim_closedir(MYDIR *dir) | 357 | void sim_closedir(MYDIR *dir) |
351 | { | 358 | { |
352 | free(dir->name); | 359 | free(dir->name); |