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

* commit 'be0a44eaf76193a23362ef8449adc50ef9e3ecce':
  Bump __clang_minor__ check to 6 for __builtin_isnan
This commit is contained in:
Andrew Hsieh
2014-04-28 17:13:46 +00:00
committed by Android Git Automerger
4 changed files with 4 additions and 4 deletions

View File

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

View File

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

View File

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

View File

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