diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-10-09 07:27:06 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-10-09 07:27:06 -0700 |
| commit | 8c35202927a7cd8f14b219e4949195e1e6bc6946 (patch) | |
| tree | 2cc79d36f916c220b3bc449cba4d3ab602f534c4 /src/dlmalloc.c | |
| parent | efaf3590ac33702eeff423e31e85f690b1fc7eb2 (diff) | |
| parent | 06354eda6092add55034c692bd65734a61083e8b (diff) | |
Merge branch 'llvm-svn'
Conflicts:
src/dlmalloc.c
tests/dlmalloc.c
tests/runner.py
tools/shared.py
Diffstat (limited to 'src/dlmalloc.c')
| -rw-r--r-- | src/dlmalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dlmalloc.c b/src/dlmalloc.c index 672ca48d..aa37dc0d 100644 --- a/src/dlmalloc.c +++ b/src/dlmalloc.c @@ -2,7 +2,7 @@ #define __THROW #define __attribute_malloc__ #define __wur -#include "emscripten.h" + /* This is a version (aka dlmalloc) of malloc/free/realloc written by |