XMerge branch 'next' of ssh://git.code.sf.net/p/flightgear/simgear into next

This commit is contained in:
Erik Hofman 2016-06-01 23:13:59 +02:00
commit add3a934af

View File

@ -64,9 +64,11 @@
# define bcopy(from, to, n) memcpy(to, from, n) # define bcopy(from, to, n) memcpy(to, from, n)
# if _MSC_VER >= 1200 // msvc++ 6.0 up to MSVC2013 # if _MSC_VER >= 1200 // msvc++ 6.0 up to MSVC2013
# if _MSC_VER < 1900
# define snprintf _snprintf
# endif
# if _MSC_VER < 1800 # if _MSC_VER < 1800
# define isnan _isnan # define isnan _isnan
# define snprintf _snprintf
# endif # endif
# if _MSC_VER < 1500 # if _MSC_VER < 1500
# define vsnprintf _vsnprintf # define vsnprintf _vsnprintf