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

2016-06-01 23:13:59 +02:00 · 2016-06-01 23:13:59 +02:00 · add3a934af
commit add3a934af
parent e82e4f8c93 92878f37f9
1 changed files with 3 additions and 1 deletions
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@ -64,9 +64,11 @@
 #  define bcopy(from, to, n) memcpy(to, from, n)

 #  if _MSC_VER >= 1200 // msvc++ 6.0 up to MSVC2013
+#    if _MSC_VER < 1900
+#      define snprintf _snprintf
+#    endif
 #    if _MSC_VER < 1800
 #      define isnan _isnan
-#      define snprintf _snprintf
 #    endif
 #    if _MSC_VER < 1500
 #      define vsnprintf _vsnprintf