[wasm] Fix eglib issues with WASM.

diff --git a/mono/eglib/eglib-config.h.in b/mono/eglib/eglib-config.h.in
index 71797575e685c1107665e4eb14481f1fcb3a796f..26e48fd3490604163234891c3852203c5449f507 100644 (file)
--- a/mono/eglib/eglib-config.h.in
+++ b/mono/eglib/eglib-config.h.in
@@ -37,6 +37,11 @@ typedef signed   @GSIZE@ gssize;
 #define G_BREAKPOINT()
 #endif
 
+#if defined (HOST_WASM)
+#undef G_BREAKPOINT
+#define G_BREAKPOINT() do { printf ("MONO: BREAKPOINT\n"); abort (); } while (0)
+#endif
+
 typedef @PIDTYPE@ GPid;
 
 #endif

diff --git a/mono/eglib/gpath.c b/mono/eglib/gpath.c
index 59f5923125bffef92db3ff085e4d4ac12773cbd6..21e7770460345029bb2dea2ddd6a56eca8c7f57f 100644 (file)
--- a/mono/eglib/gpath.c
+++ b/mono/eglib/gpath.c
@@ -160,7 +160,8 @@ g_path_get_basename (const char *filename)
        return g_strdup (&r[1]);
 }
 
-#ifndef HAVE_STRTOK_R
+//wasm does have strtok_r even though autoconf fails to find
+#if !defined (HAVE_STRTOK_R) && !defined (HOST_WASM)
 // This is from BSD's strtok_r
 
 char *