am 0ec050af: am f581c1ea: Unbundle libstlport with NDK r4.
Merge commit '0ec050af98e7e3e60d0b5a2a98a5b1c381b7f77c' into gingerbread-plus-aosp
* commit '0ec050af98e7e3e60d0b5a2a98a5b1c381b7f77c':
Unbundle libstlport with NDK r4.
diff --git a/src/num_put_float.cpp b/src/num_put_float.cpp
index cb5c446..e66ae93 100644
--- a/src/num_put_float.cpp
+++ b/src/num_put_float.cpp
@@ -139,7 +139,7 @@
static inline bool _Stl_is_neg_inf(double x) { return isinf(x) && x < 0; }
# elif (defined (__unix) || defined (__unix__)) && \
!defined (__APPLE__) && !defined (__DJGPP) && !defined(__osf__) && \
- !defined (_CRAY)
+ !defined (_CRAY) && !defined (__ANDROID__)
static inline bool _Stl_is_nan_or_inf(double x) { return IsNANorINF(x); }
static inline bool _Stl_is_inf(double x) { return IsNANorINF(x) && IsINF(x); }
static inline bool _Stl_is_neg_inf(double x) { return (IsINF(x)) && (x < 0.0); }
@@ -275,7 +275,8 @@
{ return _ldfcvt(*(long_double*)&x, n, pt, sign); }
# endif
# define _STLP_CVT_NEED_SYNCHRONIZATION
-# elif defined (__unix) && !defined (__APPLE__) && !defined (_CRAY)
+# elif defined (__unix) && !defined (__APPLE__) && !defined (_CRAY) && \
+ !defined (__ANDROID__)
static inline char* _Stl_ecvtR(double x, int n, int* pt, int* sign, char* buf)
{ return ecvt_r(x, n, pt, sign, buf); }
static inline char* _Stl_fcvtR(double x, int n, int* pt, int* sign, char* buf)
