Merge remote-tracking branch 'origin/v9-minor'

CHANGELOG

@@ -155,6 +155,7 @@ Fixed bugs
 - fixed that names and description of the LPI's were not null-terminated
 - fixed decision on when to enforce nonlinear constraints on relaxation solutions if integer variables present
 - fixed reading of very long lines (>78000 characters) in FlatZinc reader
+- fixed write of strings with at least 1024 characters when compiling with MSVS 2015 (14.0) or later (earlier MSVS still have an issue, which will not be fixed)
 
 Performance improvements
 ------------------------

src/scip/fileio.c

@@ -77,7 +77,7 @@ int SCIPfprintf(SCIP_FILE *stream, const char *format, ...)
    int n;
 
    va_start(ap, format); /*lint !e826*/
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_MSC_VER) && _MSC_VER < 1900
    n = _vsnprintf(buffer, BUFFER_LEN, format, ap);
 #else
    n = vsnprintf(buffer, BUFFER_LEN, format, ap);

src/scip/message.c

@@ -48,7 +48,7 @@
 #endif
 
 /* do defines for windows directly her to make the lpi more independent*/
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 #endif

src/scip/misc.c

@@ -10889,7 +10889,7 @@ int SCIPsnprintf(
 
    va_start(ap, s); /*lint !e826*/
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_MSC_VER) && _MSC_VER < 1900
    n = _vsnprintf(t, (size_t) len, s, ap);
 #else
    n = vsnprintf(t, (size_t) len, s, ap); /*lint !e571*/