Revision: 42404
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42404
Author: psy-fi
Date: 2011-12-04 14:47:21 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Fix warning for redefinition of __MSVCRT_VERSION__
Modified Paths:
--------------
trunk/blender/extern/libmv/libmv/tracking/brute_region_tracker.cc
Modified: trunk/blender/extern/libmv/libmv/tracking/brute_region_tracker.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/tracking/brute_region_tracker.cc
2011-12-04 14:43:37 UTC (rev 42403)
+++ trunk/blender/extern/libmv/libmv/tracking/brute_region_tracker.cc
2011-12-04 14:47:21 UTC (rev 42404)
@@ -28,6 +28,10 @@
// Needed for memalign on Linux and _aligned_alloc on Windows.
#ifdef FREE_WINDOWS
/* make sure _aligned_malloc is included */
+#ifdef __MSVCRT_VERSION__
+#undef __MSVCRT_VERSION__
+#endif
+
#define __MSVCRT_VERSION__ 0x0700
#endif
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
