diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-04-26 18:04:16 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-04-26 18:04:16 -0700 |
| commit | a28ec5203a93cc1270eeeebe0e1cea6e2ea2d1c1 (patch) | |
| tree | fdd0d544aba03ed52859c07a65ab6ec9f0ba4f03 /system/lib/dlmalloc.c | |
| parent | a7768671a526845565d04644b755fbee5ea804bf (diff) | |
| parent | c6932c1ea9cf971d53ed45e9c792c7ed9cd3d81a (diff) | |
Merge pull request #1092 from waywardmonkeys/dlmalloc-weak-export
Flag malloc_usable_size as weak.
Diffstat (limited to 'system/lib/dlmalloc.c')
| -rw-r--r-- | system/lib/dlmalloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/system/lib/dlmalloc.c b/system/lib/dlmalloc.c index 9a84d48f..e833ae42 100644 --- a/system/lib/dlmalloc.c +++ b/system/lib/dlmalloc.c @@ -1275,7 +1275,8 @@ extern "C" { p = malloc(n); assert(malloc_usable_size(p) >= 256); */ - size_t dlmalloc_usable_size(void*); + /* XXX EMSCRIPTEN: mark for export (and therefore weak) */ + DLMALLOC_EXPORT size_t dlmalloc_usable_size(void*); #endif /* ONLY_MSPACES */ |