[Avida-SVN] r2758 - in development/source: main platform

[baer at myxo.css.msu.edu]

Author: baer
Date: 2008-08-23 10:57:39 -0400 (Sat, 23 Aug 2008)
New Revision: 2758

Modified:
   development/source/main/cEnvironment.cc
   development/source/main/cTaskLib.cc
   development/source/platform/platform.h
Log:

Added some FreeBSD fixes to main development trunk.



Modified: development/source/main/cEnvironment.cc
===================================================================
--- development/source/main/cEnvironment.cc	2008-08-23 00:42:17 UTC (rev 2757)
+++ development/source/main/cEnvironment.cc	2008-08-23 14:57:39 UTC (rev 2758)
@@ -1043,7 +1043,7 @@
       if (cur_process->GetDemeFraction()) {
         deme_bonus = cur_process->GetDemeFraction() * bonus;
         bonus = (1-cur_process->GetDemeFraction()) * bonus;
-      }
+        }
       
       // Take care of the organism's bonus:
       switch (cur_process->GetType()) {

Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2008-08-23 00:42:17 UTC (rev 2757)
+++ development/source/main/cTaskLib.cc	2008-08-23 14:57:39 UTC (rev 2758)
@@ -49,6 +49,11 @@
 # define log2(x) (log(x)/log(2.0))
 #endif
 
+// Various workarounds for FreeBSD
+#if AVIDA_PLATFORM(FREEBSD)
+# define log2(x) (log(x)/log(2.0))
+#endif
+
 static const double dCastPrecision = 100000.0;
 
 

Modified: development/source/platform/platform.h
===================================================================
--- development/source/platform/platform.h	2008-08-23 00:42:17 UTC (rev 2757)
+++ development/source/platform/platform.h	2008-08-23 14:57:39 UTC (rev 2758)
@@ -39,11 +39,15 @@
 # pragma warning( disable : 4355 )
 #endif
 
-#if defined(__APPLE__) || defined(unix) || defined(__unix) || defined(__unix__) || defined (__NetBSD__) || defined(_AIX)
+#if defined(__APPLE__) || defined(unix) || defined(__unix) || defined(__unix__) || defined (__NetBSD__) || defined(_AIX) || defined(__FreeBSD__)
 # define AVIDA_PLATFORM_UNIX 1
 # define AVIDA_PLATFORM_THREADS 1
 #endif
 
+#if defined(__FreeBSD__)
+# define AVIDA_PLATFORM_FREEBSD 1
+#endif
+
 #if defined(__APPLE__)
 # define AVIDA_PLATFORM_APPLE 1
 #endif