diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-31 13:29:49 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-31 13:29:49 +0400 |
| commit | 14423219c993d0c735fd8e54744742dc81ac09b7 (patch) | |
| tree | a1aef6f0ed5199043d870d9b24e60cb6f18a0919 /extern | |
| parent | a666441d702996ce7f507857f9750d5715b0e0b5 (diff) | |
Sync changes from trunk
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/libmv/numeric/tinyvector.cc | 0 | ||||
| -rw-r--r-- | extern/libmv/libmv/tracking/brute_region_tracker.cc | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/extern/libmv/libmv/numeric/tinyvector.cc b/extern/libmv/libmv/numeric/tinyvector.cc deleted file mode 100644 index e69de29bb2d..00000000000 --- a/extern/libmv/libmv/numeric/tinyvector.cc +++ /dev/null diff --git a/extern/libmv/libmv/tracking/brute_region_tracker.cc b/extern/libmv/libmv/tracking/brute_region_tracker.cc index 2c7f613ee4a..a416710ad2b 100644 --- a/extern/libmv/libmv/tracking/brute_region_tracker.cc +++ b/extern/libmv/libmv/tracking/brute_region_tracker.cc @@ -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 |