From 9e3a282429daf8ca13977ebad4eaa72470bca197 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 24 Aug 2002 21:12:51 +0000 Subject: [PATCH] Added guard to prevent VS7 builds using the #defines for cosf etc. --- include/osg/Math | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/osg/Math b/include/osg/Math index fd4453477..b044c6979 100644 --- a/include/osg/Math +++ b/include/osg/Math @@ -7,7 +7,10 @@ #include -#if defined(WIN32) || defined (macintosh)|| defined (sun) || defined (__DARWIN_OSX__) +#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) ) || \ + defined (macintosh)|| \ + defined (sun) || \ + defined (__DARWIN_OSX__) #include @@ -55,7 +58,11 @@ #endif -#if defined(WIN32) || defined (macintosh)|| defined (sun) || defined (__DARWIN_OSX__) || defined (__hpux__) +#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) ) || \ + defined (macintosh)|| \ + defined (sun) || \ + defined (__DARWIN_OSX__) ||\ + defined (__hpux__) #ifndef floorf #define floorf (float)floor