diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-07-30 15:41:55 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-07-30 16:14:16 +0300 |
| commit | 6247f4889a8b8769c48f05691dcd8db514d0c444 (patch) | |
| tree | 02c3a85defae1b46eaebaf1f181ee2d341a4a334 /sal | |
| parent | 2d206ffb2612018b54efeda5109d52e269e6b16b (diff) | |
Work around isfinite crack with NDK r8b and the 4.6 toolchain
Change-Id: I66e499d942b34d27e765d00f1ddfb3bbd1f78480
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/inc/sal/mathconf.h | 3 |
1 files changed, 2 insertions, 1 deletions
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) |