diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2011-12-04 18:43:37 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2011-12-04 18:43:37 +0400 |
| commit | 166a6877b788834748ad23696f014f2003412623 (patch) | |
| tree | fa0d3401f696ad02401ad3a3f0a4bb4e7adbc410 /extern | |
| parent | af8587c6d6666c8fa4fb313c5f8766868a8ef007 (diff) | |
Fix MinGW compilation:
define __MSVCRT_VERSION__ to 0x0700 (microsoft runtime msvcr70.dll) so _aligned_malloc is defined.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/libmv/tracking/brute_region_tracker.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/extern/libmv/libmv/tracking/brute_region_tracker.cc b/extern/libmv/libmv/tracking/brute_region_tracker.cc index 29b0fc5ff38..5b840e10857 100644 --- a/extern/libmv/libmv/tracking/brute_region_tracker.cc +++ b/extern/libmv/libmv/tracking/brute_region_tracker.cc @@ -26,6 +26,11 @@ #ifndef __APPLE__ // Needed for memalign on Linux and _aligned_alloc on Windows. +#ifdef FREE_WINDOWS +/* make sure _aligned_malloc is included */ +#define __MSVCRT_VERSION__ 0x0700 +#endif + #include <malloc.h> #else // Apple's malloc is 16-byte aligned, and does not have malloc.h, so include |