X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fcompiler.h;h=939d9f319c6ad18b2942f7125ebd7fc6504688e4;hb=b4b9d3a4b7bf0d80e971551be81f7d8196919157;hp=5f02adb27bfeccab9c550d19e7094585e1acc624;hpb=aefe9bc11682f39b3936b9f01a0d37e9d6428078;p=simgear.git diff --git a/simgear/compiler.h b/simgear/compiler.h index 5f02adb2..939d9f31 100644 --- a/simgear/compiler.h +++ b/simgear/compiler.h @@ -63,6 +63,9 @@ # if _MSC_VER >= 1200 // msvc++ 6.0 or greater # define isnan _isnan # define snprintf _snprintf +# if _MSC_VER < 1500 +# define vsnprintf _vsnprintf +# endif # define copysign _copysign # pragma warning(disable: 4786) // identifier was truncated to '255' characters @@ -132,7 +135,7 @@ #ifdef __APPLE__ # ifdef __GNUC__ -# if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 ) +# if ( __GNUC__ > 3 ) || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 3 ) inline int (isnan)(double r) { return !(r <= 0 || r >= 0); } # else // any C++ header file undefines isinf and isnan @@ -158,10 +161,6 @@ inline int (isnan)(double r) { return !(r <= 0 || r >= 0); } # include // isnan #endif -#if defined(__MINGW32__) -# define isnan(x) _isnan(x) -#endif - // // No user modifiable definitions beyond here.