diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2011-12-04 18:47:21 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2011-12-04 18:47:21 +0400 |
| commit | 1cb3ccd35c03146b3ac79d8fc9c9fdf5c19877ad (patch) | |
| tree | 4eeffce72fd6392364d21ee7612c4f36852e90bc /extern | |
| parent | 166a6877b788834748ad23696f014f2003412623 (diff) | |
Fix warning for redefinition of __MSVCRT_VERSION__
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/libmv/tracking/brute_region_tracker.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extern/libmv/libmv/tracking/brute_region_tracker.cc b/extern/libmv/libmv/tracking/brute_region_tracker.cc index 5b840e10857..c33432b7fd7 100644 --- a/extern/libmv/libmv/tracking/brute_region_tracker.cc +++ b/extern/libmv/libmv/tracking/brute_region_tracker.cc @@ -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 |