diff options
author | Lisa Nguyen <lisa.nguyen@linaro.org> | 2016-02-25 16:58:39 -0800 |
---|---|---|
committer | Lisa Nguyen <lisa.nguyen@linaro.org> | 2016-08-08 11:14:40 -0700 |
commit | 7418cf1248a040be32b00a741742f4bd82536ccd (patch) | |
tree | 8c1c17ba03eb2fc33ffb1258a3c7c32bdd5b363b | |
parent | 8d82dd63a227c78d1f9645795f96edc955ac9a24 (diff) |
Update android_stubs.h file
Update android_stubs.h file to resolve stlport build issues. Changes
were originally made by Bernhard Rosenkränzer.
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Signed-off-by: Lisa Nguyen <lisa.nguyen@linaro.org>
-rw-r--r-- | src/android_stubs.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/android_stubs.h b/src/android_stubs.h index 60b1e29..3202635 100644 --- a/src/android_stubs.h +++ b/src/android_stubs.h @@ -1,5 +1,6 @@ #include <linux/ethtool.h> #include <sys/socket.h> +#include <string> /* Android doesn't provide locale support int its C and C++ * runtime. Handled at higher level in application stack. @@ -11,8 +12,10 @@ #define textdomain(x) #define gettext(x) (x) -/* Android C++ new operator does not throw exception on failure */ +#ifndef _LIBCPP_VERSION +/* STLport C++ new operator does not throw exception on failure */ #define set_new_handler(x) +#endif /* define stubs for C++ exception handling */ #define try if (true) |