diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /src/lib/util/delegate.h | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'src/lib/util/delegate.h')
-rw-r--r-- | src/lib/util/delegate.h | 2 |
1 files changed, 0 insertions, 2 deletions
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 |