michael@0: diff --git a/stlport/stl/config/_android.h b/stlport/stl/config/_android.h
michael@0: --- a/stlport/stl/config/_android.h
michael@0: +++ b/stlport/stl/config/_android.h
michael@0: @@ -10,18 +10,18 @@
michael@0:  #define _PTHREADS
michael@0:  
michael@0:  // Don't have native <cplusplus> headers
michael@0:  #define _STLP_HAS_NO_NEW_C_HEADERS 1
michael@0:  
michael@0:  // Use unix for streams
michael@0:  #define _STLP_USE_UNIX_IO 1
michael@0:  
michael@0: -// We do have rtti support now through GAbi++
michael@0: -#undef _STLP_NO_RTTI
michael@0: +// We don't want rtti support
michael@0: +#define _STLP_NO_RTTI 1
michael@0:  
michael@0:  // C library is in the global namespace.
michael@0:  #define _STLP_VENDOR_GLOBAL_CSTD 1
michael@0:  
michael@0:  // Don't have underlying local support.
michael@0:  #undef _STLP_REAL_LOCALE_IMPLEMENTED
michael@0:  
michael@0:  // No pthread_spinlock_t in Android
michael@0: @@ -32,48 +32,42 @@
michael@0:  
michael@0:  // Little endian platform.
michael@0:  #define _STLP_LITTLE_ENDIAN 1
michael@0:  
michael@0:  // No <exception> headers
michael@0:  #undef _STLP_NO_EXCEPTION_HEADER
michael@0:  
michael@0:  // No throwing exceptions
michael@0: -#undef _STLP_NO_EXCEPTIONS
michael@0: -
michael@0: +#define _STLP_NO_EXCEPTIONS 1
michael@0: +#define _STLP_NO_EXCEPTION_HEADER 1
michael@0:  
michael@0:  // No need to define our own namespace
michael@0:  #define _STLP_NO_OWN_NAMESPACE 1
michael@0:  
michael@0:  // Use __new_alloc instead of __node_alloc, so we don't need static functions.
michael@0:  #define _STLP_USE_SIMPLE_NODE_ALLOC 1
michael@0:  
michael@0:  // Don't use extern versions of range errors, so we don't need to
michael@0:  // compile as a library.
michael@0:  #define _STLP_USE_NO_EXTERN_RANGE_ERRORS 1
michael@0:  
michael@0:  // The system math library doesn't have long double variants, e.g
michael@0:  // sinl, cosl, etc
michael@0:  #define _STLP_NO_VENDOR_MATH_L 1
michael@0:  
michael@0: -// Define how to include our native headers.
michael@0: -#define _STLP_NATIVE_HEADER(header) <usr/include/header>
michael@0: -#define _STLP_NATIVE_C_HEADER(header) <../include/header>
michael@0: -#define _STLP_NATIVE_CPP_C_HEADER(header) <../../gabi++/include/header>
michael@0: -#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../../gabi++/include/header>
michael@0: -#define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <usr/include/header>
michael@0: -
michael@0:  // Include most of the gcc settings.
michael@0:  #include <stl/config/_gcc.h>
michael@0:  
michael@0:  // Do not use glibc, Android is missing some things.
michael@0:  #undef _STLP_USE_GLIBC
michael@0:  
michael@0:  // No exceptions.
michael@0: -#undef _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT
michael@0: -#undef _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT
michael@0: +#define _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT 1
michael@0: +#define _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT 1
michael@0:  
michael@0: -#ifndef _ANDROID_NDK_BLAZE_
michael@0: -// Android does have include_next but it doesn't work well in our build system.
michael@0: -#undef _STLP_HAS_INCLUDE_NEXT
michael@0: -#endif
michael@0: +#define _STLP_HAS_INCLUDE_NEXT 1
michael@0: +
michael@0: +// Use operator new instead of stlport own node allocator
michael@0: +#undef _STLP_USE_NEWALLOC
michael@0: +#define _STLP_USE_NEWALLOC 1
michael@0:  
michael@0:  #endif /* __stl_config__android_h */