summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Justin Kerk <dopefishjustin@gmail.com>2016-03-20 19:51:12 +0000
committer Justin Kerk <dopefishjustin@gmail.com>2016-03-20 19:51:43 +0000
commitd9d86e19099314308480c896f4c9f6a41092ece5 (patch)
treedd281ebc2fcb6cbcd53ae83903db80993a0cf2f3
parent8238ccf756a0a5aa18a5ed9ccd4ad218dbb3b02b (diff)
Enable the internal delegates for Emscripten too (nw)
-rw-r--r--src/lib/util/delegate.cpp2
-rw-r--r--src/lib/util/delegate.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/util/delegate.cpp b/src/lib/util/delegate.cpp
index 27a909e1fc4..c8633633325 100644
--- a/src/lib/util/delegate.cpp
+++ b/src/lib/util/delegate.cpp
@@ -39,7 +39,7 @@ delegate_mfp::raw_mfp_data delegate_mfp::s_null_mfp = { {0 }};
delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const
{
-#if defined(__arm__) || defined(__ARMEL__) || defined(__aarch64__) || defined(__MIPSEL__) || defined(__mips_isa_rev) || defined(__mips64)
+#if defined(__arm__) || defined(__ARMEL__) || defined(__aarch64__) || defined(__MIPSEL__) || defined(__mips_isa_rev) || defined(__mips64) || defined(EMSCRIPTEN)
if ((m_this_delta & 1) == 0) {
#if defined(LOG_DELEGATES)
printf("Calculated Addr = %08x\n", (uintptr_t)(void*)(m_function));
diff --git a/src/lib/util/delegate.h b/src/lib/util/delegate.h
index ceae47bf54c..6b4f6a01f58 100644
--- a/src/lib/util/delegate.h
+++ b/src/lib/util/delegate.h
@@ -103,8 +103,6 @@
#define HAS_DIFFERENT_ABI 1
#elif defined(__clang__) && defined(__i386__) && defined(_WIN32)
#define USE_DELEGATE_TYPE DELEGATE_TYPE_COMPATIBLE
- #elif defined(EMSCRIPTEN)
- #define USE_DELEGATE_TYPE DELEGATE_TYPE_COMPATIBLE
#else
#define USE_DELEGATE_TYPE DELEGATE_TYPE_INTERNAL
#define MEMBER_ABI