[Orxonox-commit 213] r2883 - in trunk/src/bullet: . LinearMath

[landauf at orxonox.net]

Author: landauf
Date: 2009-03-31 22:28:36 +0200 (Tue, 31 Mar 2009)
New Revision: 2883

Modified:
   trunk/src/bullet/LinearMath/btScalar.h
   trunk/src/bullet/changes_orxonox.diff
Log:
reapplied mingw-patch

Modified: trunk/src/bullet/LinearMath/btScalar.h
===================================================================
--- trunk/src/bullet/LinearMath/btScalar.h	2009-03-31 18:05:51 UTC (rev 2882)
+++ trunk/src/bullet/LinearMath/btScalar.h	2009-03-31 20:28:36 UTC (rev 2883)
@@ -236,7 +236,11 @@
 SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
 SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return expf(x); }
 SIMD_FORCE_INLINE btScalar btLog(btScalar x) { return logf(x); }
-SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
+  #if defined( __MINGW32__ )
+  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return pow(x,y); }
+  #else
+  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
+  #endif
 	
 #endif
 

Modified: trunk/src/bullet/changes_orxonox.diff
===================================================================
--- trunk/src/bullet/changes_orxonox.diff	2009-03-31 18:05:51 UTC (rev 2882)
+++ trunk/src/bullet/changes_orxonox.diff	2009-03-31 20:28:36 UTC (rev 2883)
@@ -1,6 +1,8 @@
---- LinearMath\btScalar.h	So Feb 15 18:28:13 2009
-+++ LinearMath\btScalar.h	Sa Feb 14 23:04:53 2009
-@@ -227,7 +227,11 @@
+Index: btScalar.h
+===================================================================
+--- btScalar.h	(revision 2882)
++++ btScalar.h	(working copy)
+@@ -236,7 +236,11 @@
  SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
  SIMD_FORCE_INLINE btScalar btExp(btScalar x) { return expf(x); }
  SIMD_FORCE_INLINE btScalar btLog(btScalar x) { return logf(x); }
@@ -10,6 +12,6 @@
 +  #else
 +  SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return powf(x,y); }
 +  #endif
- 
+
  #endif
- 
+