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

am cb606e1f: am 88765fac: am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"

Browse Source 
* commit 'cb606e1fe286507f17d35373e6b8cb295c27eeee':
  Bump __clang_minor__ check to 6 for __builtin_isnan
This commit is contained in:
Andrew Hsieh
2014-04-28 17:11:12 +00:00
committed by Android Git Automerger
parent 44e89d3e2f cb606e1fe2
commit be0a44eaf7
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/platforms/android-13/include/math.h
View File

@@ -528,7 +528,7 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__;
double __builtin_hypot(double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__;
int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ /* int __builtin_isinf(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__ >= 6)
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else #else
/* clang < 3.5 has faulty prototype for __builtin_isnan */ /* clang < 3.5 has faulty prototype for __builtin_isnan */

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

@@ -533,7 +533,7 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__;
double __builtin_hypot(double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__;
int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ /* int __builtin_isinf(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__ >= 6)
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else #else
/* clang < 3.5 has faulty prototype for __builtin_isnan */ /* clang < 3.5 has faulty prototype for __builtin_isnan */

2
ndk/platforms/android-3/include/math.h
View File

@@ -523,7 +523,7 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__;
double __builtin_hypot(double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__;
int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ /* int __builtin_isinf(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__ >= 6)
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else #else
/* clang < 3.5 has faulty prototype for __builtin_isnan */ /* clang < 3.5 has faulty prototype for __builtin_isnan */

2
ndk/platforms/android-9/include/math.h
View File

@@ -523,7 +523,7 @@ double __builtin_fma(double, double, double) __NDK_FPABI_MATH__;
double __builtin_hypot(double, double) __NDK_FPABI_MATH__; double __builtin_hypot(double, double) __NDK_FPABI_MATH__;
int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2; int __builtin_ilogb(double) __NDK_FPABI_MATH__ __pure2;
/* int __builtin_isinf(double) __NDK_FPABI_MATH__ __pure2; */ /* int __builtin_isinf(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__ >= 6)
int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2; int __builtin_isnan(double) __NDK_FPABI_MATH__ __pure2;
#else #else
/* clang < 3.5 has faulty prototype for __builtin_isnan */ /* clang < 3.5 has faulty prototype for __builtin_isnan */