4 files changed, 9 insertions, 8 deletions
diff --git a/firmware/include/dbgcheck.h b/firmware/include/dbgcheck.h
index e1f7aef..0b38627 100644
--- a/firmware/include/dbgcheck.h
+++ b/firmware/include/dbgcheck.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 
 #ifdef DEBUG
- #ifndef SIMULATOR
+ #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
   /* check whether a function is inside the valid memory location */
   #define IS_FUNCPTR(fp) ({/
      extern char _text[];/
@@ -21,4 +21,4 @@
 #endif
 
 
-#endif // #ifndef __DBGCHECK_H__
-\ No newline at end of file
+#endif // #ifndef __DBGCHECK_H__
diff --git a/firmware/include/dir_uncached.h b/firmware/include/dir_uncached.h
index 4e5acf3..f225cf8 100644
--- a/firmware/include/dir_uncached.h
+++ b/firmware/include/dir_uncached.h
@@ -32,7 +32,7 @@
 #define ATTR_ARCHIVE     0x20
 #define ATTR_VOLUME      0x40 /* this is a volume, not a real directory */
 
-#ifdef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
 #define dirent_uncached sim_dirent
 #define DIR_UNCACHED SIM_DIR
 #define opendir_uncached sim_opendir
@@ -57,7 +57,7 @@ struct dirent_uncached {
 #include "fat.h"
 
 typedef struct {
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
     bool busy;
     long startcluster;
     struct fat_dir fatdir;
@@ -66,7 +66,7 @@ typedef struct {
     int volumecounter; /* running counter for faked volume entries */
 #endif
 #else
-    /* simulator: */
+    /* simulator/application: */
     void *dir; /* actually a DIR* dir */
     char *name;
 #endif
diff --git a/firmware/include/dircache.h b/firmware/include/dircache.h
index 9fd55fa..4472d5f 100644
--- a/firmware/include/dircache.h
+++ b/firmware/include/dircache.h
@@ -36,7 +36,7 @@ struct travel_data {
     struct dircache_entry *first;
     struct dircache_entry *ce;
     struct dircache_entry *down_entry;
-#ifdef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
     DIR_UNCACHED *dir, *newdir;
     struct dirent_uncached *entry;
 #else
diff --git a/firmware/include/file.h b/firmware/include/file.h
index f66cc6c..9502f59 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -26,6 +26,7 @@
 #define MAX_PATH 260
 
 #include <sys/types.h>
+#include "config.h"
 #include "_ansi.h"
 
 #define MAX_OPEN_FILES 11
@@ -49,7 +50,7 @@
 #define O_TRUNC  0x10
 #endif
 
-#if  defined(SIMULATOR) && !defined(PLUGIN) && !defined(CODEC)
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED) && !defined(PLUGIN) && !defined(CODEC)
 #define open(x, ...) sim_open(x, __VA_ARGS__)
 #define creat(x,m) sim_creat(x,m)
 #define remove(x) sim_remove(x)
@@ -78,7 +79,7 @@ extern int fsync(int fd);
 extern ssize_t read(int fd, void *buf, size_t count);
 extern off_t lseek(int fildes, off_t offset, int whence);
 extern int file_creat(const char *pathname);
-#ifndef SIMULATOR
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 /* posix compatibility function */
 static inline int creat(const char *pathname, mode_t mode)
 {