Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-03-22 19:48:36 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-03-22 19:48:36 +0300
commit897a21e6a34513e70af2dc452fa704643f91e796 (patch)
tree67c7c9dcf4b55de71f965d8993a9e9ea6ef19db8 /extern/glog
parent4486eddfaad28ac7a3700c80eed4ece45976625b (diff)
Glog: Restore some custom config for MSVC2015
Diffstat (limited to 'extern/glog')
-rw-r--r--extern/glog/src/windows/config.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/extern/glog/src/windows/config.h b/extern/glog/src/windows/config.h
index 2d23fb08159..1cc2533daa5 100644
--- a/extern/glog/src/windows/config.h
+++ b/extern/glog/src/windows/config.h
@@ -1,5 +1,8 @@
/* src/config.h.in. Generated from configure.ac by autoheader. */
+/* define if you have google gflags library */
+#define HAVE_LIB_GFLAGS 1
+
/* Namespace for Google classes */
#define GOOGLE_NAMESPACE google
@@ -9,6 +12,10 @@
/* Puts following code inside the Google namespace */
#define _START_GOOGLE_NAMESPACE_ namespace google {
+#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1900))
+# define HAVE_SNPRINTF
+#endif
+
/* Always the empty-string on non-windows systems. On windows, should be
"__declspec(dllexport)". This way, when we compile the dll, we export our
functions/classes. It's safe to define this here because config.h is only