aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS. Davilla <davilla@4pi.com>2012-05-01 19:36:49 -0400
committerS. Davilla <davilla@4pi.com>2012-05-01 19:38:06 -0400
commit32cebcb730f892d66059e364eb251dc4b68087c4 (patch)
treebdfd1e211c2183374deb215d65d5804fc470d4cf
parent2e3e68273cd67308e135318acd432dbb1eb74f9d (diff)
revert 'Fixing MathUtils.h for ARM', this breaks android. If using hardfp, then round_int using c instead of asm
-rw-r--r--xbmc/utils/MathUtils.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
index 47517b5786..d914e43cb4 100644
--- a/xbmc/utils/MathUtils.h
+++ b/xbmc/utils/MathUtils.h
@@ -63,7 +63,7 @@ namespace MathUtils
sar i, 1
}
#else
-#if defined(__powerpc__) || defined(__ppc__)
+#if defined(__powerpc__) || defined(__ppc__) || defined(__ARM_PCS_VFP)
i = floor(x + round_to_nearest);
#elif defined(__arm__)
// From 'ARMĀ®v7-M Architecture Reference Manual' page A7-569: