1 files changed, 18 insertions, 2 deletions

diff --git a/uisimulator/x11/dir.h b/uisimulator/x11/dir.h
index c7d557b475..3e83ce44b4 100644
--- a/uisimulator/x11/dir.h
+++ b/uisimulator/x11/dir.h
@@ -17,10 +17,26 @@
  *
  ****************************************************************************/
 
+#define dirent x11_dirent
+#define readdir(x) x11_readdir(x)
+#define opendir(x) x11_opendir(x)
+
+/*
+ * The defines above should let us use the readdir() and opendir() in target
+ * code just as they're defined to work in target. They will then call our
+ * x11_* versions of the functions that'll work as wrappers for the actual
+ * host functions.
+ */
+
 #include <sys/types.h>
 #include <dirent.h>
 
-#define opendir(x) x11_opendir(x)
+#undef dirent
+
+
+#define DIRFUNCTIONS_DEFINED /* prevent those prototypes */
 
-#define DIRENT_DEFINED /* prevent it from getting defined again */
 #include "../../firmware/common/dir.h"
+
+extern DIR *x11_opendir(char *name);
+