Skip to content

Commit

Permalink
[ios] fixed, clang does not like this arm asm, phi need some help here
Browse files Browse the repository at this point in the history
  • Loading branch information
davilla committed May 16, 2012
1 parent 03abb0b commit 354381b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions xbmc/utils/MathUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ namespace MathUtils
sar i, 1
}
#else
#if defined(__powerpc__) || defined(__ppc__) || defined(__ARM_PCS_VFP) || defined(TARGET_DARWIN_OSX)
#if defined(__powerpc__) || defined(__ppc__) || defined(__ARM_PCS_VFP) || defined(TARGET_DARWIN)
i = floor(x + round_to_nearest);
#elif defined(__arm__)
// From 'ARM®v7-M Architecture Reference Manual' page A7-569:
Expand Down Expand Up @@ -135,7 +135,7 @@ namespace MathUtils
assert(x > static_cast<double>(INT_MIN / 2) - 1.0);
assert(x < static_cast <double>(INT_MAX / 2) + 1.0);

#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(TARGET_DARWIN_OSX)
#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(TARGET_DARWIN)
const float round_towards_m_i = -0.5f;
#endif
int i;
Expand All @@ -151,7 +151,7 @@ namespace MathUtils
sar i, 1
}
#else
#if defined(__powerpc__) || defined(__ppc__) || defined(TARGET_DARWIN_OSX)
#if defined(__powerpc__) || defined(__ppc__) || defined(TARGET_DARWIN)
return (int)x;
#elif defined(__arm__)
__asm__ __volatile__ (
Expand Down

0 comments on commit 354381b

Please sign in to comment.