From Bob Kuehne, change on __DARWIN_OSX__ define to __APPLE__

2004-03-08 11:02:05 +00:00
parent 1e4bceb562
commit bd37f999c4
15 changed files with 33 additions and 30 deletions
--- a/src/osg/Timer.cpp
+++ b/src/osg/Timer.cpp
@@ -283,9 +283,9 @@ const Timer* Timer::instance()

    }

-#elif defined (__DARWIN_OSX__)  || defined (macintosh)
+#elif defined (__APPLE__)  || defined (macintosh)

-    #if defined (__DARWIN_OSX__)
+    #if defined (__APPLE__)
        #include <Carbon/Carbon.h>         // do I really have to link against the Carbon framework just for this?
    #else    
        #include <MacTypes.h>