Merge pull request #2 from zheka/master

the hack is rather temporary esp in mono/io-layer/shared.c, to be investigated further
elijahtaylor · Oct 25, 2011 · 8a1f7ae · 8a1f7ae
2 parents edad8f9 + 4ccdf44
commit 8a1f7ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/mono/io-layer/shared.c b/mono/io-layer/shared.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef HAVE_SYS_SEM_H
+#if defined(HAVE_SYS_SEM_H) && !(defined(__native_client__) && defined(__GLIBC__))
 #  include <sys/sem.h>
 #else
 #  define DISABLE_SHARED_HANDLES

diff --git a/mono/mini/wapihandles.c b/mono/mini/wapihandles.c
@@ -3,7 +3,7 @@
 
 #include "mini.h"
 
-#if defined(HOST_WIN32) || !defined(HAVE_SYS_IPC_H) || !defined(HAVE_SYS_SEM_H)
+#if defined(HOST_WIN32) || !defined(HAVE_SYS_IPC_H) || !defined(HAVE_SYS_SEM_H) || (defined(__native_client__) && defined(__GLIBC__))
 
 int mini_wapi_hps (int argc, char **argv)
 {

diff --git a/mono/utils/mono-dl.c b/mono/utils/mono-dl.c
@@ -315,6 +315,12 @@ mono_dl_open (const char *name, int flags, char **error_msg)
 	MonoDlFallbackHandler *dl_fallback = NULL;
 	int lflags = LL_SO_TRFLAGS (flags);
 
+#if defined(__native_client__) && defined(__GLIBC__)
+	if (error_msg)
+		*error_msg = g_strdup ("No mono_dl_open for NaCl");
+	return NULL;
+#endif
+
 	if (error_msg)
 		*error_msg = NULL;