r20146 by jghali - some changes for compatibility with msvc 2015

[scribus-commit]

Author: jghali
Date: Thu Jun  4 22:16:36 2015
New Revision: 20146

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20146
Log:
some changes for compatibility with msvc 2015

Modified:
    branches/Version14x/Scribus/win32/vc11/win-config.h
    branches/Version14x/Scribus/win32/vc9/win-config.h

Modified: branches/Version14x/Scribus/win32/vc11/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20146&path=/branches/Version14x/Scribus/win32/vc11/win-config.h
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/win-config.h (original)
+++ branches/Version14x/Scribus/win32/vc11/win-config.h Thu Jun  4 22:16:36 2015
@@ -71,9 +71,8 @@
 #undef HAVE_RES_INIT
 
 /* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-#ifdef _MSC_VER
 #define HAVE_SNPRINTF 1
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
 #define snprintf(a, b, c, d) _snprintf(a, b, c, d)
 #endif
 

Modified: branches/Version14x/Scribus/win32/vc9/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20146&path=/branches/Version14x/Scribus/win32/vc9/win-config.h
==============================================================================
--- branches/Version14x/Scribus/win32/vc9/win-config.h (original)
+++ branches/Version14x/Scribus/win32/vc9/win-config.h Thu Jun  4 22:16:36 2015
@@ -71,9 +71,8 @@
 #undef HAVE_RES_INIT
 
 /* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-#ifdef _MSC_VER
 #define HAVE_SNPRINTF 1
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
 #define snprintf(a, b, c, d) _snprintf(a, b, c, d)
 #endif