1 files changed, 18 insertions, 24 deletions

diff --git a/firmware/include/file.h b/firmware/include/file.h
index 4ba9c503b4..9b7f123999 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -38,33 +38,27 @@
 
 #if !defined(PLUGIN) && !defined(CODEC)
 #if defined(APPLICATION) && !defined(__PCTOOL__)
-#   define open(x, ...)    app_open(x, __VA_ARGS__)
-#   define creat(x,m)      app_creat(x, m)
-#   define remove(x)       app_remove(x)
-#   define rename(x,y)     app_rename(x,y)
-extern int app_open(const char *name, int o, ...);
-extern int app_creat(const char *name, mode_t mode);
-extern int app_remove(const char* pathname);
-extern int app_rename(const char* path, const char* newname);
+#include "rbpaths.h"
+#   define open(x, ...)     app_open(x, __VA_ARGS__)
+#   define creat(x,m)       app_creat(x, m)
+#   define remove(x)        app_remove(x)
+#   define rename(x,y)      app_rename(x,y)
 #   if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
-#   define fsync(x) sim_fsync(x)
-#   define ftruncate(x,y) sim_ftruncate(x,y)
-#   define lseek(x,y,z) sim_lseek(x,y,z)
-#   define read(x,y,z) sim_read(x,y,z)
-#   define write(x,y,z) sim_write(x,y,z)
-#   define close(x) sim_close(x)
+/* SDL overrides a few more */
+#   define read(x,y,z)      sim_read(x,y,z)
+#   define write(x,y,z)     sim_write(x,y,z)
 #   endif
 #elif defined(SIMULATOR) || defined(DBTOOL)
-#   define open(x, ...) sim_open(x, __VA_ARGS__)
-#   define creat(x,m) sim_creat(x,m)
-#   define remove(x) sim_remove(x)
-#   define rename(x,y) sim_rename(x,y)
-#   define fsync(x) sim_fsync(x)
-#   define ftruncate(x,y) sim_ftruncate(x,y)
-#   define lseek(x,y,z) sim_lseek(x,y,z)
-#   define read(x,y,z) sim_read(x,y,z)
-#   define write(x,y,z) sim_write(x,y,z)
-#   define close(x) sim_close(x)
+#   define open(x, ...)     sim_open(x, __VA_ARGS__)
+#   define creat(x,m)       sim_creat(x,m)
+#   define remove(x)        sim_remove(x)
+#   define rename(x,y)      sim_rename(x,y)
+#   define fsync(x)         sim_fsync(x)
+#   define ftruncate(x,y)   sim_ftruncate(x,y)
+#   define lseek(x,y,z)     sim_lseek(x,y,z)
+#   define read(x,y,z)      sim_read(x,y,z)
+#   define write(x,y,z)     sim_write(x,y,z)
+#   define close(x)         sim_close(x)
 extern int sim_open(const char *name, int o, ...);
 extern int sim_creat(const char *name, mode_t mode);
 #endif