[Opende-svn] SF.net SVN: opende:[1920] trunk/include/ode

[<ole...@us...>]

Revision: 1920
          http://opende.svn.sourceforge.net/opende/?rev=1920&view=rev
Author:   oleh_derevenko
Date:     2012-12-26 10:17:08 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
Fixed: Inclusion of <ode/precision.h> moved to proper header (was causing compile errors in dSINGLE mode)

Modified Paths:
--------------
    trunk/include/ode/common.h
    trunk/include/ode/odeconfig.h

Modified: trunk/include/ode/common.h
===================================================================
--- trunk/include/ode/common.h	2012-12-25 23:31:06 UTC (rev 1919)
+++ trunk/include/ode/common.h	2012-12-26 10:17:08 UTC (rev 1920)
@@ -23,8 +23,6 @@
 #ifndef _ODE_COMMON_H_
 #define _ODE_COMMON_H_
 
-#include <ode/precision.h>
-
 #include <ode/odeconfig.h>
 #include <ode/error.h>
 

Modified: trunk/include/ode/odeconfig.h
===================================================================
--- trunk/include/ode/odeconfig.h	2012-12-25 23:31:06 UTC (rev 1919)
+++ trunk/include/ode/odeconfig.h	2012-12-26 10:17:08 UTC (rev 1920)
@@ -34,6 +34,9 @@
 #include <float.h>
 
 
+#include <ode/precision.h>
+
+
 #if defined(ODE_DLL) || defined(ODE_LIB)
 #define __ODE__
 #endif
@@ -89,7 +92,11 @@
 
 /* Define the dInfinity macro */
 #ifdef INFINITY
-  #define dInfinity INFINITY
+  #ifdef dSINGLE
+    #define dInfinity ((float)INFINITY)
+  #else
+    #define dInfinity INFINITY
+  #endif
 #elif defined(HUGE_VAL)
   #ifdef dSINGLE
     #ifdef HUGE_VALF

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.