merge intel x86 patches into gingerbread branch

aospX · Jul 8, 2011 · aaea6ca · aaea6ca
2 parents 23d26c0 + 1726339
commit aaea6ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/Android.mk b/Android.mk
@@ -51,9 +51,6 @@ LOCAL_MODULE := libstlport
 LOCAL_CFLAGS := $(libstlport_cflags)
 LOCAL_CPPFLAGS := $(libstlport_cppflags)
 
-LOCAL_NDK_VERSION := 4
-LOCAL_SDK_VERSION := 8
-
 include $(LOCAL_PATH)/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
@@ -67,9 +64,6 @@ LOCAL_MODULE := libstlport_static
 LOCAL_CFLAGS := $(libstlport_cflags)
 LOCAL_CPPFLAGS := $(libstlport_cppflags)
 
-LOCAL_NDK_VERSION := 4
-LOCAL_SDK_VERSION := 8
-
 include $(LOCAL_PATH)/libstlport.mk
 include $(BUILD_STATIC_LIBRARY)
 

diff --git a/src/num_put_float.cpp b/src/num_put_float.cpp
@@ -139,7 +139,7 @@ static inline bool _Stl_is_inf(double x)        { return isinf(x); }
 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 @@ static inline char* _Stl_fcvtR(long double x, int n, int* pt, int* sign)
 { 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)