diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-20 21:03:11 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-20 21:26:25 +0400 |
commit | 6ba5c0c2683bb7718dfceca3868d5f2c9e4795c1 (patch) | |
tree | 11989e797939c41ba4b889ebcfe63456320a50cf /extern/libmv/third_party/gflags | |
parent | 2ea78fb28f5f90c736b6d048b5e1f1d787c48920 (diff) |
Update Libmv to latest upstream
This is mainly a maintaince commit which syncs changes
between Blender and Libmv upstream also bringing new
GLog version.
This GLog version is presumably have better support of
MinGW from "the box".
This commit is also aimed to make further 3d part libs
update easier.
Diffstat (limited to 'extern/libmv/third_party/gflags')
-rw-r--r-- | extern/libmv/third_party/gflags/gflags/gflags_declare.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/libmv/third_party/gflags/gflags/gflags_declare.h b/extern/libmv/third_party/gflags/gflags/gflags_declare.h index e3013826d53..503b686657f 100644 --- a/extern/libmv/third_party/gflags/gflags/gflags_declare.h +++ b/extern/libmv/third_party/gflags/gflags/gflags_declare.h @@ -49,17 +49,17 @@ #endif namespace google { -#if 1 // the C99 format +#if defined(__GNUC__) || defined(__MINGW32__) // the C99 format typedef int32_t int32; typedef uint32_t uint32; typedef int64_t int64; typedef uint64_t uint64; -#elif 1 // the BSD format +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) // the BSD format typedef int32_t int32; typedef u_int32_t uint32; typedef int64_t int64; typedef u_int64_t uint64; -#elif 0 // the windows (vc7) format +#elif defined(_MSC_VER) // the windows (vc7) format typedef __int32 int32; typedef unsigned __int32 uint32; typedef __int64 int64; |