Hi Robert, your changes are fine for me. Tested.
Thanks Olaf Am 07.11.2011 um 15:37 schrieb Robert Osfield: > Hi Olaf, > > Thanks for the fix. I've reviewed it and am now happy about using OSX > specific defines in scope that isn't protected by an __APPLE__ so am > not going to merge your changes as is. > > There is some previous code in the include/osg/Math that has an > __APPLE__ specific pathway that creates a APPLE_PRE_10_2 define that > is later used, so I've used this approach combined with your OSX > version check to provide a APPLE_PRE_10_6 define. See svn diff below. > > My changes are now checked into svn/trunk. > > Could you try these out? > > Thanks, > Robert. > > > > Index: include/osg/Math > =================================================================== > --- include/osg/Math (revision 12876) > +++ include/osg/Math (working copy) > @@ -37,6 +37,11 @@ > #if (__GNUC__ < 4) > #define APPLE_PRE_10_2 > #endif > + > + #if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6) > + #define APPLE_PRE_10_6 > + #endif > + > #endif > #endif > > @@ -45,7 +50,7 @@ > #endif > > #if defined (sun) || \ > - defined (__APPLE__) || \ > + defined (APPLE_PRE_10_6) || \ > (defined (_AIX) && defined (__GNUC__)) > > #include <float.h> > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
