fix dirent.h and folders test

system/include/libc/dirent.h

@@ -3,12 +3,13 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include <sys/dirent.h>
 
 #if !defined(MAXNAMLEN) && !defined(_POSIX_SOURCE)
 #define MAXNAMLEN 1024
 #endif
 
+#include <sys/dirent.h>
+
 #ifdef __cplusplus
 }
 #endif

system/include/libc/sys/dirent.h

@@ -7,7 +7,23 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#error "<dirent.h> not supported"
+
+struct DIR;
+
+/* XXX Emscripten */
+struct dirent {
+  ino_t d_ino;
+  char  d_name[MAXNAMLEN];
+  int   d_off;
+  int   d_reclen;
+  char  d_type;
+};
+
+DIR           *opendir(const char *);
+void           seekdir(DIR *, long);
+long           telldir(DIR *);
+struct dirent *readdir(DIR *);
+
 #ifdef __cplusplus
 }
 #endif

tests/runner.py

@@ -140,9 +140,6 @@ class RunnerCore(unittest.TestCase):
       # the additional files were copied; alter additional_files to point to their full paths now
       additional_files = map(lambda f: os.path.join(dirname, f), additional_files)
 
-    # Copy Emscripten C++ API
-    shutil.copy(path_from_root('src', 'include', 'emscripten.h'), dirname)
-
     # C++ => LLVM binary
     os.chdir(dirname)
     cwd = os.getcwd()

tools/shared.py

@@ -34,9 +34,9 @@ COMPILER_OPTS = COMPILER_OPTS + ['-m32', '-v', '-U__i386__', '-U__x86_64__', '-U
 if USE_EMSDK:
   COMPILER_OPTS += [ '-nostdinc',
   '-I' + path_from_root('system', 'include'),
+  '-I' + path_from_root('system', 'include', 'freebsd'), # posix stuff
   '-I' + path_from_root('system', 'include', 'libc'),
   '-I' + path_from_root('system', 'include', 'libcxx'),
-  '-I' + path_from_root('system', 'include', 'freebsd'), # sys/mman.h
 ]
 
 # Engine tweaks