LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 365e66fe: Merge "Fixed API18 math.h for clang3.4"

Browse Source 
* commit '365e66feaf8f653fdc1618f6e220207a28bb4bc6':
  Fixed API18 math.h for clang3.4
This commit is contained in:
Andrew Hsieh
2014-01-06 16:26:01 -08:00
committed by Android Git Automerger
parent cbe870105d 365e66feaf
commit e89c4f7f47
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ndk/platforms/android-18/include/math.h
View File

@@ -536,7 +536,7 @@ int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
#if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5) #if !defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5)
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else #else
/* clang < 3.4 has faulty prototype for __builtin_isnan */ /* clang < 3.5 has faulty prototype for __builtin_isnan */
#endif #endif
double __builtin_lgamma(double) __NDK_FPABI_MATH__; double __builtin_lgamma(double) __NDK_FPABI_MATH__;
long long __builtin_llrint(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_nanl(const char *) __NDK_FPABI_MATH__ __pure2;
long double __builtin_nearbyintl(long double) __NDK_FPABI_MATH__; long double __builtin_nearbyintl(long double) __NDK_FPABI_MATH__;
long double __builtin_nextafterl(long double, 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__; double __builtin_nexttoward(double, long double) __NDK_FPABI_MATH__;
float __builtin_nexttowardf(float, long double) __NDK_FPABI_MATH__; float __builtin_nexttowardf(float, long double) __NDK_FPABI_MATH__;
#else #else