archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Sync changes from trunk

Browse Source
This commit is contained in:
Sergey Sharybin
2011-12-31 09:29:49 +00:00
parent a666441d70
commit 14423219c9
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
extern/libmv/libmv/numeric/tinyvector.cc vendored
View File

9
extern/libmv/libmv/tracking/brute_region_tracker.cc vendored
View File

@@ -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