diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:55:19 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:56:03 -0800 |
| commit | cd1edebb5034ea52396a5b68304e84ae80878740 (patch) | |
| tree | 6a6f8364ea74985d11c4f6ff74e5b80e08dc849d /system/lib/libcxxabi/src/cxa_exception.cpp | |
| parent | af59788f8b7b76515e36bee1bf66edf497b801db (diff) | |
| parent | 2914deb17f3857bb02eeec87a58a3ed6d4a8853a (diff) | |
Merge branch 'incoming' of github.com:kripken/emscripten into incoming1.8.8
conflicts: tests/test_core.py tools/shared.py
Diffstat (limited to 'system/lib/libcxxabi/src/cxa_exception.cpp')
| -rw-r--r-- | system/lib/libcxxabi/src/cxa_exception.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/lib/libcxxabi/src/cxa_exception.cpp b/system/lib/libcxxabi/src/cxa_exception.cpp index f8c38c07..c43777c2 100644 --- a/system/lib/libcxxabi/src/cxa_exception.cpp +++ b/system/lib/libcxxabi/src/cxa_exception.cpp @@ -15,7 +15,7 @@ #include <exception> // for std::terminate #include <cstdlib> // for malloc, free -#include <string> // for memset +#include <cstring> // for memset #include <pthread.h> #include "cxa_exception.hpp" |