[Bf-blender-cvs] [b6697b4] master: MSVC 2015 fix: do not redefine snprintf, even MS is getting standards complient

Martijn Berger noreply at git.blender.org
Thu Dec 31 08:53:29 CET 2015


Commit: b6697b4d2af7679c440bbbf0a2ca1f213b64a189
Author: Martijn Berger
Date:   Thu Dec 31 08:53:06 2015 +0100
Branches: master
https://developer.blender.org/rBb6697b4d2af7679c440bbbf0a2ca1f213b64a189

MSVC 2015 fix: do not redefine snprintf, even MS is getting standards complient

===================================================================

M	extern/libmv/intern/utildefines.h

===================================================================

diff --git a/extern/libmv/intern/utildefines.h b/extern/libmv/intern/utildefines.h
index 7366b24..b1f11d6 100644
--- a/extern/libmv/intern/utildefines.h
+++ b/extern/libmv/intern/utildefines.h
@@ -26,7 +26,7 @@
 #ifndef LIBMV_C_API_UTILDEFINES_H_
 #define LIBMV_C_API_UTILDEFINES_H_
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #  define __func__ __FUNCTION__
 #  define snprintf _snprintf
 #endif




More information about the Bf-blender-cvs mailing list