From Eric Wing, clean ups for OSX support.

src/osg/Timer.cpp

@@ -285,27 +285,10 @@ const Timer* Timer::instance()
 
 #elif defined (__APPLE__)  || defined (macintosh)
 
-    #if defined (__APPLE__)
-        #include <Carbon/Carbon.h>         // do I really have to link against the Carbon framework just for this?
-    #else    
-        #include <MacTypes.h>
-        #include <Timer.h>
-    #endif
-
-
-    Timer::Timer( void )
+    Timer::Timer()
     {
-        _useStandardClock = false;
-        _secsPerTick = 1e-6; // Carbon timer's precision.
-
-    }
-
-    Timer_t Timer::tick(void) const
-    {
-        UnsignedWide usecs;
-        Microseconds(&usecs);
-
-        return (usecs.hi * 4294967296.0) + usecs.lo;
+        _useStandardClock = true;
+        _secsPerTick = 1e-6; // gettimeofday()'s precision.
     }
 
 #elif defined(unix)

src/osgPlugins/ac3d/ac3d.cpp

@@ -6,9 +6,8 @@
 
 
 #include <stdio.h>
-#ifdef __APPLE__
-#include <sys/malloc.h>
-#else
+// Where is malloc.h really needed?
+#if !defined(__APPLE__) && !defined(macintosh)
 #include <malloc.h>
 #endif
 #include <math.h>

src/osgPlugins/dx/DXWriter.cpp

@@ -602,10 +602,10 @@ inline int IsNaNorInf( float f )
     case FP_PINF : return 1;
     default      : return 0;
   }
-#elif defined(__FreeBSD__) || defined(__linux) || defined(__CYGWIN__) 
+#elif defined(__FreeBSD__) || defined(__APPLE__)
+  return isnan(f) || isinf(f); // isnanf is deprecated
+#elif defined(__linux) || defined(__CYGWIN__)
   return isnanf(f) || isinf(f);
-#elif  defined(__APPLE__)
-  return __isnanf(f) || __isinf(f);
 #elif defined(__sun)
   return isnan(f);  // KLUDGE - hack to get this to compile w/g++. 
 #elif defined(WIN32)

src/osgPlugins/iv/parser.cpp

@@ -56,12 +56,11 @@
 #  pragma warning (disable:4541)
 #endif
 
-#ifdef __APPLE__
-#include <sys/types.h>
-#include <sys/malloc.h>
-#else
+// Where is malloc.h really needed?
+#if !defined(__APPLE__) && !defined(macintosh)
 #include <malloc.h>
 #endif
+
 #include "mynode.h"
 #include <stdlib.h>
 #include "geometry.h"

src/osgPlugins/iv/parser.y

@@ -23,11 +23,11 @@
 #  pragma warning (disable:4541)
 #endif
 
-#ifdef __APPLE__
-#include <sys/malloc.h>
-#else
+// Where is malloc.h really needed?
+#if !defined(__APPLE__) && !defined(macintosh)
 #include <malloc.h>
 #endif
+
 #include "mynode.h"
 #include <stdlib.h>
 #include "geometry.h"