From Bob Kuehne, change on __DARWIN_OSX__ define to __APPLE__

include/osg/GL

@@ -18,7 +18,7 @@
 
     // non windows, doesn't require nonsense as seen below :-)    
     #ifndef __gl_h_
-        #ifdef __DARWIN_OSX__
+        #ifdef __APPLE__
             #include <OpenGL/gl.h>
         #else
             #include <GL/gl.h>

include/osg/GLExtensions

@@ -21,7 +21,7 @@
     #define WIN32_LEAN_AND_MEAN
     #define NOMINMAX
     #include <windows.h>
-#elif defined(__DARWIN_OSX__)
+#elif defined(__APPLE__)
     #include <mach-o/dyld.h>
 #else
     #include <dlfcn.h>
@@ -50,7 +50,7 @@ inline void* getGLExtensionFuncPtr(const char *funcName)
 
     return (void*)wglGetProcAddress(funcName);
 
-#elif defined(__DARWIN_OSX__)
+#elif defined(__APPLE__)
 
     std::string temp( "_" );
     temp += funcName;	// Mac OS X prepends an underscore on function names

include/osg/GLU

@@ -14,7 +14,7 @@
 #ifndef OSG_GLU
 #define OSG_GLU 1
 
-#ifdef __DARWIN_OSX__
+#ifdef __APPLE__
 	#include <OpenGL/glu.h>
 #else
 	#include <GL/glu.h>

include/osg/Math

@@ -19,7 +19,7 @@
 // for OSX users :
 // comment in if you want backwards compatibility with 10.1.x versions
 // otherwise you'll have problems with missing floorf and __isnan*()
-// #define DARWIN_OSX_PRE_10_2
+// #define APPLE_PRE_10_2
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
     #include <float.h>
@@ -28,7 +28,7 @@
 
 #if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
     defined (sun) || \
-    defined (__DARWIN_OSX__)
+    defined (__APPLE__)
     
 
     #include <float.h>
@@ -88,7 +88,7 @@
 #if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
     defined (sun) || \
     defined (__hpux__) || \
-    defined (DARWIN_OSX_PRE_10_2)
+    defined (APPLE_PRE_10_2)
 
     #ifndef floorf
     #define floorf (float)floor
@@ -163,7 +163,7 @@ inline double RadiansToDegrees(double angle) { return angle*180.0/PI; }
     inline bool isNaN(float v) { return _isnan(v)!=0; }
     inline bool isNaN(double v) { return _isnan(v)!=0; }
 #else
-    # if defined(__DARWIN_OSX__) && !defined (DARWIN_OSX_PRE_10_2)
+    # if defined(__APPLE__) && !defined (APPLE_PRE_10_2)
         inline bool isNaN(float v) { return __isnanf(v); }
         inline bool isNaN(double v) { return __isnand(v); }
     #else

include/osg/Timer

@@ -57,7 +57,7 @@ class SG_EXPORT Timer {
         static const Timer* instance();
 
 
-    #if defined __DARWIN_OSX__  || defined macintosh
+    #if defined __APPLE__  || defined macintosh
         // PJA MAC OSX - inline Tick() pollutes namespace so badly 
         // we cant compile, due to Carbon.h ...
             Timer_t tick() const;
@@ -219,7 +219,7 @@ class SG_EXPORT Timer {
         }
     }
 
-#elif !defined (__DARWIN_OSX__) && !defined (macintosh)
+#elif !defined (__APPLE__) && !defined (macintosh)
 
     // no choice, always use std::clock()
     namespace osg{