[Bf-blender-cvs] [66bea2d] master: Fix compilation error on Windows

Sergey Sharybin noreply at git.blender.org
Sat Jan 2 09:18:01 CET 2016


Commit: 66bea2d77e0416bee3d3f49ee3d820adfd80f922
Author: Sergey Sharybin
Date:   Sat Jan 2 13:17:39 2016 +0500
Branches: master
https://developer.blender.org/rB66bea2d77e0416bee3d3f49ee3d820adfd80f922

Fix compilation error on Windows

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

M	extern/libmv/third_party/gflags/gflags/gflags_declare.h

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

diff --git a/extern/libmv/third_party/gflags/gflags/gflags_declare.h b/extern/libmv/third_party/gflags/gflags/gflags_declare.h
index 9b85f46..197197d 100644
--- a/extern/libmv/third_party/gflags/gflags/gflags_declare.h
+++ b/extern/libmv/third_party/gflags/gflags/gflags_declare.h
@@ -47,7 +47,7 @@
 
 // We always want to import the symbols of the gflags library
 #ifndef GFLAGS_DLL_DECL
-#  if 1 && defined(_MSC_VER)
+#  if 0 && defined(_MSC_VER)
 #    define GFLAGS_DLL_DECL __declspec(dllimport)
 #  else
 #    define GFLAGS_DLL_DECL
@@ -56,7 +56,7 @@
 
 // We always want to import variables declared in user code
 #ifndef GFLAGS_DLL_DECLARE_FLAG
-#  ifdef _MSC_VER
+#  if 0 && defined(_MSC_VER)
 #    define GFLAGS_DLL_DECLARE_FLAG __declspec(dllimport)
 #  else
 #    define GFLAGS_DLL_DECLARE_FLAG




More information about the Bf-blender-cvs mailing list