*** empty log message ***

src/osg/FrameStamp.cpp

@@ -47,7 +47,7 @@ FrameStamp& FrameStamp::operator = (const FrameStamp& fs)
     return *this;
 }
 
-void FrameStamp::setCalanderTime(const tm& ct)
+void FrameStamp::setCalanderTime(const std::tm& ct)
 {
     tm_sec = ct.tm_sec;            /* Seconds.    [0-60] (1 leap second) */
     tm_min = ct.tm_min;            /* Minutes.    [0-59] */
@@ -60,7 +60,7 @@ void FrameStamp::setCalanderTime(const tm& ct)
     tm_isdst = ct.tm_isdst;            /* DST.        [-1/0/1]*/
 }
 
-void FrameStamp::getCalanderTime(tm& ct) const
+void FrameStamp::getCalanderTime(std::tm& ct) const
 {
     ct.tm_sec = tm_sec;            /* Seconds.    [0-60] (1 leap second) */
     ct.tm_min = tm_min;            /* Minutes.    [0-59] */

src/osg/Timer.cpp

@@ -180,8 +180,14 @@ using namespace osg;
             _secsPerClick = (double)(cycleval)* 1e-12;
         }
     }
-#elif defined (__APPLE_CC__)       // MACOSX PJA
-#include <Carbon/Carbon.h>         // do I really have to link against the Carbon framework just for this?
+#elif defined (__APPLE_CC__)  || defined (macintosh)
+
+#if defined (__APPLE_CC__)
+	#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_t Timer::tick(void)
 {

src/osgGLUT/Viewer.cpp

@@ -109,10 +109,8 @@ Viewer::Viewer()
 
     osg::notify(osg::INFO)<<"Scene Graph Viewer (sgv)"<<endl;
 
-#ifndef macintosh
     osg::notify(osg::INFO)<<"   '"<<osgGetLibraryName()<<"' Version "<<osgGetVersion()<<endl;
     osg::notify(osg::INFO)<<"   '"<<osgUtilGetLibraryName()<<"' Version "<<osgUtilGetVersion()<<endl;
-#endif
 
     _initialTick = _timer.tick();
     _frameTick = _initialTick;