Also PREFIX() other filesystem functions. I hope I got them all now...

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28929 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 12 insertions, 7 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index e07d5b4d5d..5e7ac94665 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -317,8 +317,8 @@ static const struct plugin_api rockbox_api = {
     PREFIX(creat),
 #endif
     (write_func)PREFIX(write),
-    remove,
-    rename,
+    PREFIX(remove),
+    PREFIX(rename),
     PREFIX(ftruncate),
     PREFIX(filesize),
     fdprintf,
@@ -338,11 +338,11 @@ static const struct plugin_api rockbox_api = {
     crc_32,
 
     /* dir */
-    opendir,
-    closedir,
-    readdir,
-    mkdir,
-    rmdir,
+    (opendir_func)PREFIX(opendir),
+    (closedir_func)PREFIX(closedir),
+    (readdir_func)PREFIX(readdir),
+    PREFIX(mkdir),
+    PREFIX(rmdir),
     dir_exists,
     dir_get_info,
 
diff --git a/firmware/include/dir.h b/firmware/include/dir.h
index 4f1993143c..3427893024 100644
--- a/firmware/include/dir.h
+++ b/firmware/include/dir.h
@@ -72,4 +72,9 @@
 # define rmdir rmdir_uncached
 #endif
 
+
+typedef DIR* (*opendir_func)(const char* name);
+typedef int (*closedir_func)(DIR* dir);
+typedef struct dirent* (*readdir_func)(DIR* dir);
+
 #endif