diff options
author | Jukka Jylänki <jujjyl@gmail.com> | 2013-04-12 13:03:13 +0300 |
---|---|---|
committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-04-12 14:27:39 +0300 |
commit | af586c3c8e712751f2f99e10aa71c749edaeca41 (patch) | |
tree | de6621ef7408d2ac226498af53ce4c4135805f35 | |
parent | a28ef129d6a56ae671d1f2d3aa287bbdaffc7442 (diff) |
Revert "Bring back EMSCRIPTEN_KEEPALIVE" - instead directly use the __attribute__((used)) macro in embind/bind.cpp.
This reverts commit cbf636a88bcfcabf084331fc4d8a445cacb158f9.
-rw-r--r-- | system/include/emscripten/emscripten.h | 2 | ||||
-rwxr-xr-x | system/lib/embind/bind.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/include/emscripten/emscripten.h b/system/include/emscripten/emscripten.h index a4474670..61634b0e 100644 --- a/system/include/emscripten/emscripten.h +++ b/system/include/emscripten/emscripten.h @@ -24,7 +24,7 @@ extern "C" { * with closure, asm.js, etc. For example * -s EXPORTED_FUNCTIONS=["_main", "myfunc"] */ -#define EMSCRIPTEN_KEEPALIVE __attribute__((used)) +/* #define EMSCRIPTEN_KEEPALIVE __attribute__((used)) */ /* * Interface to the underlying JS engine. This function will diff --git a/system/lib/embind/bind.cpp b/system/lib/embind/bind.cpp index 1619eddc..deb55138 100755 --- a/system/lib/embind/bind.cpp +++ b/system/lib/embind/bind.cpp @@ -12,7 +12,7 @@ using namespace emscripten;
extern "C" {
- const char* EMSCRIPTEN_KEEPALIVE __getTypeName(const std::type_info* ti) {
+ const char* __attribute__((used)) __getTypeName(const std::type_info* ti) {
#ifdef USE_CXA_DEMANGLE
int stat;
char* demangled = abi::__cxa_demangle(ti->name(), NULL, NULL, &stat);
|