Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/kicklib2/src/external/bullet/changes_orxonox.diff @ 8501

Last change on this file since 8501 was 8284, checked in by rgrieder, 14 years ago

Merged revisions 7978 - 8096 from kicklib to kicklib2.

  • Property svn:eol-style set to native
File size: 721 bytes
RevLine 
[8284]1--- LinearMath/btScalar.h       Tue Aug 10 13:19:44 2010
2+++ LinearMath/btScalar.h       Sun Feb 27 01:27:34 2011
3@@ -286,7 +286,11 @@
[2705]4 SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
5 SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return expf(x); }
6 SIMD_FORCE_INLINE btScalar btLog(btScalar x) { return logf(x); }
7-SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
8+  #if defined( __MINGW32__ )
9+  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return pow(x,y); }
10+  #else
11+  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
12+  #endif
[8284]13 SIMD_FORCE_INLINE btScalar btFmod(btScalar x,btScalar y) { return fmodf(x,y); }
14       
[2705]15 #endif
Note: See TracBrowser for help on using the repository browser.