Merge from 5.2.

include/m_string.h

@@ -249,8 +249,7 @@ extern ulonglong strtoull(const char *str, char **ptr, int base);
 
 extern size_t my_vsnprintf(char *str, size_t n,
                            const char *format, va_list ap);
-extern size_t my_snprintf(char *to, size_t n, const char *fmt, ...)
-  ATTRIBUTE_FORMAT(printf, 3, 4);
+extern size_t my_snprintf(char *to, size_t n, const char *fmt, ...);
 
 #if defined(__cplusplus)
 }

win/packaging/ca/CMakeLists.txt

@@ -33,7 +33,7 @@ IF(MSVC_VERSION EQUAL 1400)
 ELSEIF(MSVC_VERSION EQUAL 1500)
   SET(WIX35_MSVC_SUFFIX "_2008")
   SET(WIX36_MSVC_SUFFIX "VS2008")
-ELSEIF(MSVC_VERSION EQUAL 1600)
+ELSEIF(MSVC_VERSION EQUAL 1600 OR MSVC_VERSION EQUAL 1700 )
   SET(WIX35_MSVC_SUFFIX "_2010")
   SET(WIX36_MSVC_SUFFIX "VS2010")
 ELSE()