From 6247f4889a8b8769c48f05691dcd8db514d0c444 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 30 Jul 2012 15:41:55 +0300
Subject: Work around isfinite crack with NDK r8b and the 4.6 toolchain

Change-Id: I66e499d942b34d27e765d00f1ddfb3bbd1f78480
---
 sal/inc/sal/mathconf.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sal')

diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index 9a046c5f0f3e..c03adc45413d 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -63,7 +63,8 @@ extern "C" {
 
 
 /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
-#if !defined SOLARIS && defined(__cplusplus) \
+#if !defined SOLARIS && !defined ANDROID \
+                     && defined(__cplusplus) \
                      && ( defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L )
 #define SAL_MATH_FINITE(d) std::isfinite(d)
 #elif defined( WNT)
-- 
cgit