[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43026] branches/soc-2011-tomato/extern/ libmv/libmv: Sync changes from trunk

[Sergey Sharybin]

Revision: 43026
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43026
Author:   nazgul
Date:     2011-12-31 09:29:49 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
Sync changes from trunk

Modified Paths:
--------------
    branches/soc-2011-tomato/extern/libmv/libmv/tracking/brute_region_tracker.cc

Removed Paths:
-------------
    branches/soc-2011-tomato/extern/libmv/libmv/numeric/tinyvector.cc

Deleted: branches/soc-2011-tomato/extern/libmv/libmv/numeric/tinyvector.cc
===================================================================
Modified: branches/soc-2011-tomato/extern/libmv/libmv/tracking/brute_region_tracker.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/tracking/brute_region_tracker.cc	2011-12-31 09:23:06 UTC (rev 43025)
+++ branches/soc-2011-tomato/extern/libmv/libmv/tracking/brute_region_tracker.cc	2011-12-31 09:29:49 UTC (rev 43026)
@@ -26,6 +26,15 @@
 
 #if !defined(__APPLE__) && !defined(__FreeBSD__)
 // 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
+
 #include <malloc.h>
 #else
 // Apple's malloc is 16-byte aligned, and does not have malloc.h, so include