diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-15 17:01:19 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-15 17:01:19 -0800 |
| commit | c42b937808924f6b922b29d2e0fd1fe1d1b0411c (patch) | |
| tree | 4027d435b6638a7e72b9519990298fb9314ecc96 /system/lib/libcxxabi/src/cxa_exception.cpp | |
| parent | 8478d6aee54d6c52de16d8c58309534afbf5bf9e (diff) | |
| parent | e5ccf17e84e7a5102bf9e05ffef01e6672b4c15a (diff) | |
Merge branch 'incoming'
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" |