[Opende-svn] SF.net SVN: opende:[1579] branches/extensionapi/include/ode/odeconfig.h

[<kw...@us...>]

Revision: 1579
          http://opende.svn.sourceforge.net/opende/?rev=1579&view=rev
Author:   kwizatz
Date:     2008-10-27 22:34:24 +0000 (Mon, 27 Oct 2008)

Log Message:
-----------
Removed newline property due to merge conflicts, should be back to normal once merge is complete.

Modified Paths:
--------------
    branches/extensionapi/include/ode/odeconfig.h

Property Changed:
----------------
    branches/extensionapi/include/ode/odeconfig.h

Modified: branches/extensionapi/include/ode/odeconfig.h
===================================================================
--- branches/extensionapi/include/ode/odeconfig.h	2008-10-27 22:28:04 UTC (rev 1578)
+++ branches/extensionapi/include/ode/odeconfig.h	2008-10-27 22:34:24 UTC (rev 1579)
@@ -1,75 +1,75 @@
-#ifndef ODECONFIG_H
-#define ODECONFIG_H
-
-#ifndef dDOUBLE
-#ifndef dSINGLE
-#define dSINGLE
-#endif
-#endif
-
-/* Pull in the standard headers */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <math.h>
-#include <string.h>
-#include <float.h>
-
-/* Define a DLL export symbol for those platforms that need it */
-#if defined(_MSC_VER)
-  #if defined(ODE_DLL)
-    #define ODE_API __declspec(dllexport)
-  #elif !defined(ODE_LIB)
-    #define ODE_DLL_API __declspec(dllimport)
-  #endif
-#endif
-
-#if !defined(ODE_API)
-  #define ODE_API
-#endif
-
-/* Well-defined common data types...need to define for 64 bit systems */
-#if defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)
-  #define X86_64_SYSTEM   1
-  typedef int             int32;
-  typedef unsigned int    uint32;
-  typedef short           int16;
-  typedef unsigned short  uint16;
-  typedef char            int8;
-  typedef unsigned char   uint8;
-#else
-  typedef int             int32;
-  typedef unsigned int    uint32;
-  typedef short           int16;
-  typedef unsigned short  uint16;
-  typedef char            int8;
-  typedef unsigned char   uint8;
-#endif
-
-/* Visual C does not define these functions */
-#if defined(_MSC_VER)
-  #define copysignf _copysign
-  #define copysign _copysign
-#endif
-
-
-
-/* Define the dInfinity macro */
-#ifdef INFINITY
-  #define dInfinity INFINITY
-#elif defined(HUGE_VAL)
-  #ifdef dSINGLE
-    #ifdef HUGE_VALF
-      #define dInfinity HUGE_VALF
-    #else
-      #define dInfinity HUGE_VAL
-    #endif
-  #else
-    #define dInfinity HUGE_VAL
-  #endif
-#else
-  #define dInfinity ((1.0)/(0.0))
-#endif
-
-
-#endif
+#ifndef ODECONFIG_H
+#define ODECONFIG_H
+
+#ifndef dDOUBLE
+#ifndef dSINGLE
+#define dSINGLE
+#endif
+#endif
+
+/* Pull in the standard headers */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <math.h>
+#include <string.h>
+#include <float.h>
+
+/* Define a DLL export symbol for those platforms that need it */
+#if defined(_MSC_VER)
+  #if defined(ODE_DLL)
+    #define ODE_API __declspec(dllexport)
+  #elif !defined(ODE_LIB)
+    #define ODE_DLL_API __declspec(dllimport)
+  #endif
+#endif
+
+#if !defined(ODE_API)
+  #define ODE_API
+#endif
+
+/* Well-defined common data types...need to define for 64 bit systems */
+#if defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)
+  #define X86_64_SYSTEM   1
+  typedef int             int32;
+  typedef unsigned int    uint32;
+  typedef short           int16;
+  typedef unsigned short  uint16;
+  typedef char            int8;
+  typedef unsigned char   uint8;
+#else
+  typedef int             int32;
+  typedef unsigned int    uint32;
+  typedef short           int16;
+  typedef unsigned short  uint16;
+  typedef char            int8;
+  typedef unsigned char   uint8;
+#endif
+
+/* Visual C does not define these functions */
+#if defined(_MSC_VER)
+  #define copysignf _copysign
+  #define copysign _copysign
+#endif
+
+
+
+/* Define the dInfinity macro */
+#ifdef INFINITY
+  #define dInfinity INFINITY
+#elif defined(HUGE_VAL)
+  #ifdef dSINGLE
+    #ifdef HUGE_VALF
+      #define dInfinity HUGE_VALF
+    #else
+      #define dInfinity HUGE_VAL
+    #endif
+  #else
+    #define dInfinity HUGE_VAL
+  #endif
+#else
+  #define dInfinity ((1.0)/(0.0))
+#endif
+
+
+#endif


Property changes on: branches/extensionapi/include/ode/odeconfig.h
___________________________________________________________________
Deleted: svn:eol-style
   - native


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