Merge "misc fix"
diff --git a/stlport/stl/_clocale.h b/stlport/stl/_clocale.h
index 091a9b6..2dcf39a 100644
--- a/stlport/stl/_clocale.h
+++ b/stlport/stl/_clocale.h
@@ -31,7 +31,7 @@
# if defined (_STLP_IMPORT_VENDOR_CSTD)
_STLP_BEGIN_NAMESPACE
using _STLP_VENDOR_CSTD::lconv;
-# if !defined (_STLP_NO_CSTD_FUNCTION_IMPORTS)
+# if !defined (_STLP_NO_CSTD_FUNCTION_IMPORTS) && !defined(__ANDROID__)
using _STLP_VENDOR_CSTD::localeconv;
using _STLP_VENDOR_CSTD::setlocale;
# endif
diff --git a/stlport/stl/_cmath.h b/stlport/stl/_cmath.h
index 5cb0cd5..771c27d 100644
--- a/stlport/stl/_cmath.h
+++ b/stlport/stl/_cmath.h
@@ -205,7 +205,7 @@
/** rough characterization of compiler and native C library
For the compiler, it can either support long double or not. If it doesn't, the
-macro _STLP_NO_LONG_DOUBLE is not defined and we don't define any long double
+macro _STLP_NO_LONG_DOUBLE is defined and we don't define any long double
overloads.
For the native C library the question is whether it has variants with an 'f'
suffix (for float as opposed to double) or an 'l' suffix (for long double). If
