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) | |
download | rockbox-ded525e4668fd630647273691556accccd329700.tar.gz rockbox-ded525e4668fd630647273691556accccd329700.zip |
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) | |||
290 | if (!entry) | 290 | if (!entry) |
291 | break; | 291 | break; |
292 | 292 | ||
293 | DEBUGF("aaa\n"); | ||
293 | info = dir_get_info(dir, entry); | 294 | info = dir_get_info(dir, entry); |
295 | DEBUGF("ccc\n"); | ||
294 | len = strlen((char *)entry->d_name); | 296 | len = strlen((char *)entry->d_name); |
295 | 297 | ||
296 | /* skip directories . and .. */ | 298 | /* 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 @@ | |||
26 | #include "file.h" | 26 | #include "file.h" |
27 | #include "filefuncs.h" | 27 | #include "filefuncs.h" |
28 | 28 | ||
29 | #ifndef __PCTOOL__ | ||
29 | #ifdef HAVE_MULTIVOLUME | 30 | #ifdef HAVE_MULTIVOLUME |
30 | /* returns on which volume this is, and copies the reduced name | 31 | /* returns on which volume this is, and copies the reduced name |
31 | (sortof a preprocessor for volume-decorated pathnames) */ | 32 | (sortof a preprocessor for volume-decorated pathnames) */ |
@@ -88,7 +89,9 @@ bool dir_exists(const char *path) | |||
88 | return true; | 89 | return true; |
89 | } | 90 | } |
90 | 91 | ||
91 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 92 | #endif /* __PCTOOL__ */ |
93 | |||
94 | #if (CONFIG_PLATFORM & (PLATFORM_NATIVE|PLATFORM_SDL)) | ||
92 | struct dirinfo dir_get_info(DIR* parent, struct dirent *entry) | 95 | struct dirinfo dir_get_info(DIR* parent, struct dirent *entry) |
93 | { | 96 | { |
94 | (void)parent; | 97 | (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 | |||
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 | ||
11 | ../../firmware/common/strlcpy.c | 12 | ../../firmware/common/strlcpy.c |
12 | ../../firmware/common/strcasestr.c | 13 | ../../firmware/common/strcasestr.c |
13 | ../../firmware/common/structec.c | 14 | ../../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) | |||
342 | return &secret; | 342 | return &secret; |
343 | } | 343 | } |
344 | 344 | ||
345 | struct dirinfo dir_get_info(DIR* parent, struct sim_dirent *entry) | ||
346 | { | ||
347 | (void)parent; | ||
348 | return entry->info; | ||
349 | } | ||
350 | |||
351 | |||
352 | void sim_closedir(MYDIR *dir) | 345 | void sim_closedir(MYDIR *dir) |
353 | { | 346 | { |
354 | free(dir->name); | 347 | free(dir->name); |