1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/build/stlport/android-mozilla-config.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,82 @@
1.4 +diff --git a/stlport/stl/config/_android.h b/stlport/stl/config/_android.h
1.5 +--- a/stlport/stl/config/_android.h
1.6 ++++ b/stlport/stl/config/_android.h
1.7 +@@ -10,18 +10,18 @@
1.8 + #define _PTHREADS
1.9 +
1.10 + // Don't have native <cplusplus> headers
1.11 + #define _STLP_HAS_NO_NEW_C_HEADERS 1
1.12 +
1.13 + // Use unix for streams
1.14 + #define _STLP_USE_UNIX_IO 1
1.15 +
1.16 +-// We do have rtti support now through GAbi++
1.17 +-#undef _STLP_NO_RTTI
1.18 ++// We don't want rtti support
1.19 ++#define _STLP_NO_RTTI 1
1.20 +
1.21 + // C library is in the global namespace.
1.22 + #define _STLP_VENDOR_GLOBAL_CSTD 1
1.23 +
1.24 + // Don't have underlying local support.
1.25 + #undef _STLP_REAL_LOCALE_IMPLEMENTED
1.26 +
1.27 + // No pthread_spinlock_t in Android
1.28 +@@ -32,48 +32,42 @@
1.29 +
1.30 + // Little endian platform.
1.31 + #define _STLP_LITTLE_ENDIAN 1
1.32 +
1.33 + // No <exception> headers
1.34 + #undef _STLP_NO_EXCEPTION_HEADER
1.35 +
1.36 + // No throwing exceptions
1.37 +-#undef _STLP_NO_EXCEPTIONS
1.38 +-
1.39 ++#define _STLP_NO_EXCEPTIONS 1
1.40 ++#define _STLP_NO_EXCEPTION_HEADER 1
1.41 +
1.42 + // No need to define our own namespace
1.43 + #define _STLP_NO_OWN_NAMESPACE 1
1.44 +
1.45 + // Use __new_alloc instead of __node_alloc, so we don't need static functions.
1.46 + #define _STLP_USE_SIMPLE_NODE_ALLOC 1
1.47 +
1.48 + // Don't use extern versions of range errors, so we don't need to
1.49 + // compile as a library.
1.50 + #define _STLP_USE_NO_EXTERN_RANGE_ERRORS 1
1.51 +
1.52 + // The system math library doesn't have long double variants, e.g
1.53 + // sinl, cosl, etc
1.54 + #define _STLP_NO_VENDOR_MATH_L 1
1.55 +
1.56 +-// Define how to include our native headers.
1.57 +-#define _STLP_NATIVE_HEADER(header) <usr/include/header>
1.58 +-#define _STLP_NATIVE_C_HEADER(header) <../include/header>
1.59 +-#define _STLP_NATIVE_CPP_C_HEADER(header) <../../gabi++/include/header>
1.60 +-#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../../gabi++/include/header>
1.61 +-#define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <usr/include/header>
1.62 +-
1.63 + // Include most of the gcc settings.
1.64 + #include <stl/config/_gcc.h>
1.65 +
1.66 + // Do not use glibc, Android is missing some things.
1.67 + #undef _STLP_USE_GLIBC
1.68 +
1.69 + // No exceptions.
1.70 +-#undef _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT
1.71 +-#undef _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT
1.72 ++#define _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT 1
1.73 ++#define _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT 1
1.74 +
1.75 +-#ifndef _ANDROID_NDK_BLAZE_
1.76 +-// Android does have include_next but it doesn't work well in our build system.
1.77 +-#undef _STLP_HAS_INCLUDE_NEXT
1.78 +-#endif
1.79 ++#define _STLP_HAS_INCLUDE_NEXT 1
1.80 ++
1.81 ++// Use operator new instead of stlport own node allocator
1.82 ++#undef _STLP_USE_NEWALLOC
1.83 ++#define _STLP_USE_NEWALLOC 1
1.84 +
1.85 + #endif /* __stl_config__android_h */
