diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-01-07 00:21:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-07 00:21:56 +0000 |
| commit | 365e66feaf8f653fdc1618f6e220207a28bb4bc6 (patch) | |
| tree | bcc373d5f95ffa7ec4bf3dc8bc042a78ea09f6eb | |
| parent | 29c857fe6df5362ed16f2748d2447fe76209e2cb (diff) | |
| parent | f242723e9df7ef2f1083544277766613536431dc (diff) | |
| download | development-tools_ndk_r9d.tar.gz | |
Merge "Fixed API18 math.h for clang3.4"tools_ndk_r9d
| -rw-r--r-- | ndk/platforms/android-18/include/math.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndk/platforms/android-18/include/math.h b/ndk/platforms/android-18/include/math.h index 2ab298e24..e24c00117 100644 --- a/ndk/platforms/android-18/include/math.h +++ b/ndk/platforms/android-18/include/math.h @@ -536,7 +536,7 @@ int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; #if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5) int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; #else -/* clang < 3.4 has faulty prototype for __builtin_isnan */ +/* clang < 3.5 has faulty prototype for __builtin_isnan */ #endif double __builtin_lgamma(double) __NDK_FPABI_MATH__; long long __builtin_llrint(double) __NDK_FPABI_MATH__; @@ -686,7 +686,7 @@ long double __builtin_modfl(long double, long double *) __NDK_FPABI_MATH__; /* f long double __builtin_nanl(const char *) __NDK_FPABI_MATH__ __pure2; long double __builtin_nearbyintl(long double) __NDK_FPABI_MATH__; long double __builtin_nextafterl(long double, long double) __NDK_FPABI_MATH__; -#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5) +#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4) double __builtin_nexttoward(double, long double) __NDK_FPABI_MATH__; float __builtin_nexttowardf(float, long double) __NDK_FPABI_MATH__; #else |