diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-19 16:10:49 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-19 16:10:49 +0400 |
| commit | 9c93c0bf08c0bc73d2c09e7f8c57721b557eb222 (patch) | |
| tree | 04bb2e36994e4dcaefa3bb07ed04914dcda06082 /extern/bullet2 | |
| parent | d6a53bb38f10b8881ab92dcbf8add2d62622cd9f (diff) | |
Bullet: making bullet friction workaround more furureproof by using the __apple_build_version__ macro, TODO: check if problem persists with newer clang
Diffstat (limited to 'extern/bullet2')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h index 1a6b1871f7e..8e4456e617a 100644 --- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h +++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h @@ -37,9 +37,9 @@ struct btSimdScalar { } -/* workaround for an clang 3.4 issue, friction would fail with forced inlining */ -#if (defined(__APPLE__) && defined(__clang__) && (__clang_major__ == 5) && (__clang_minor__ == 1)) \ - || (defined(__clang__) && (__clang_major__ == 3) && (__clang_minor__ == 4)) +/* workaround for clang 3.4 ( == apple clang 5.1 ) issue, friction would fail with forced inlining */ +#if (defined(__clang__) && defined(__apple_build_version__) && (__clang_major__ == 5) && (__clang_minor__ == 1)) \ +|| (defined(__clang__) && !defined(__apple_build_version__) && (__clang_major__ == 3) && (__clang_minor__ == 4)) inline __attribute__ ((noinline)) btSimdScalar(float fl) #else SIMD_FORCE_INLINE btSimdScalar(float fl) |