From 43ad7114be0b58e7643043b74eb4b9002d6221d6 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 20 May 2005 15:45:12 +0000 Subject: [PATCH] Reworking to avoid compile issues under VS6.0. --- include/osg/Math | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/include/osg/Math b/include/osg/Math index d1c8a8880..cd7074e68 100644 --- a/include/osg/Math +++ b/include/osg/Math @@ -21,22 +21,14 @@ // otherwise you'll have problems with missing floorf and __isnan*() // #define APPLE_PRE_10_2 -#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#if defined(_MSC_VER) #include #endif -#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \ - defined (sun) || \ - defined (__APPLE__) - +#if defined (sun) || defined (__APPLE__) #include - - // PJA MAC OSX - // This appears to be the simplest way to get these defined under MACOSX - // where they arent in math.h - #ifndef acosf inline float acosf(float value) { return static_cast(acos(value)); } #endif @@ -75,17 +67,8 @@ #endif -#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \ - defined (sun) - #ifndef isnanf - inline int isnanf(float value) { return isnan(value); } - #endif - -#endif - -#if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \ - defined (sun) || \ +#if defined (sun) || \ defined (__hpux) || \ defined (APPLE_PRE_10_2)