X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fcompiler.h;h=6a9ec5d84587f6ada8228eabfb6b6db83cf1e5ba;hb=d314b6a55274508d42597dff575ba2277a71fa67;hp=eca95fe5274a4139052bf9cc4473b42cefd4ce86;hpb=bbeb48a60d00e3d736e11195f77e58e2b5f70d99;p=simgear.git diff --git a/simgear/compiler.h b/simgear/compiler.h index eca95fe5..6a9ec5d8 100644 --- a/simgear/compiler.h +++ b/simgear/compiler.h @@ -63,7 +63,14 @@ # 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 +# define strcasecmp stricmp + +# undef min +# undef max # pragma warning(disable: 4786) // identifier was truncated to '255' characters # pragma warning(disable: 4244) // conversion from double to float @@ -147,6 +154,7 @@ inline int (isnan)(double r) { return !(r <= 0 || r >= 0); } #endif #if defined (__FreeBSD__) +#include # if __FreeBSD_version < 500000 extern "C" { inline int isnan(double r) { return !(r <= 0 || r >= 0); } @@ -158,10 +166,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.