Support dvb-box on openembedded build tree.

[vuplus_xbmc] / xbmc / utils / MathUtils.h

diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
index 5027117..9a6fb09 100644 (file)
--- a/xbmc/utils/MathUtils.h
+++ b/xbmc/utils/MathUtils.h
@@ -1,7 +1,7 @@
 #pragma once
 /*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
+ *      Copyright (C) 2005-2013 Team XBMC
+ *      http://xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -14,9 +14,8 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -35,17 +34,17 @@
 
 #if defined(__ppc__) || \
     defined(__powerpc__) || \
-   (defined(__APPLE__) && defined(__arm__) && defined(__llvm__)) || \
-   (defined(__ANDROID__) && defined(__arm__)) || \
-   defined(TARGET_RASPBERRY_PI)
+   (defined(TARGET_DARWIN_IOS) && defined(__llvm__)) || \
+   (defined(TARGET_ANDROID) && defined(__arm__)) || \
+    defined(TARGET_RASPBERRY_PI) || defined(TARGET_DVBBOX) // oskwon
   #define DISABLE_MATHUTILS_ASM_ROUND_INT
 #endif
 
 #if defined(__ppc__) || \
     defined(__powerpc__) || \
-   (defined(__APPLE__) && defined(__llvm__)) || \
-   (defined(__ANDROID__) && defined(__arm__)) || \
-   defined(TARGET_RASPBERRY_PI)
+   (defined(TARGET_DARWIN) && defined(__llvm__)) || \
+   (defined(TARGET_ANDROID) && defined(__arm__)) || \
+    defined(TARGET_RASPBERRY_PI) || defined(TARGET_DVBBOX) // oskwon
   #define DISABLE_MATHUTILS_ASM_TRUNCATE_INT
 #endif
 
@@ -131,7 +130,7 @@ namespace MathUtils
     const float round_dn_to_nearest = 0.4999999f;
     i = (x > 0) ? _mm_cvttsd_si32(_mm_set_sd(x + round_to_nearest)) : _mm_cvttsd_si32(_mm_set_sd(x - round_dn_to_nearest));
 
-#elif defined(_WIN32)
+#elif defined(TARGET_WINDOWS)
     __asm
     {
       fld x
@@ -179,7 +178,7 @@ namespace MathUtils
     );
     return i;
 
-#elif defined(_WIN32)
+#elif defined(TARGET_WINDOWS)
     const float round_towards_m_i = -0.5f;
     __asm
     {