diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 17:03:48 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 17:04:29 +0300 |
| commit | 59742167ce926c8898f80e00888e94c4766a9b32 (patch) | |
| tree | 7c564325faa33cfb672e54f2ecde11e1746865c5 /extern | |
| parent | f31f28c3f452fc1bfe2d4b9ca529e269c914b47e (diff) | |
Just another attempt to make MSVC happy
No idea why standalone libmv remo was all fine with the code..
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/third_party/gflags/config.h | 4 | ||||
| -rw-r--r-- | extern/libmv/third_party/gflags/gflags/gflags.h | 2 | ||||
| -rw-r--r-- | extern/libmv/third_party/gflags/gflags/gflags_declare.h | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/extern/libmv/third_party/gflags/config.h b/extern/libmv/third_party/gflags/config.h index 986329ba1c0..858510835c1 100644 --- a/extern/libmv/third_party/gflags/config.h +++ b/extern/libmv/third_party/gflags/config.h @@ -29,9 +29,7 @@ /* #undef HAVE_FNMATCH_H */ // Define if you have the <shlwapi.h> header file (Windows 2000/XP). -#ifdef WIN32 -# define HAVE_SHLWAPI_H -#endif +#undef HAVE_SHLWAPI_H // Define if you have the strtoll function. #define HAVE_STRTOLL diff --git a/extern/libmv/third_party/gflags/gflags/gflags.h b/extern/libmv/third_party/gflags/gflags/gflags.h index a4f09406808..797a54cac52 100644 --- a/extern/libmv/third_party/gflags/gflags/gflags.h +++ b/extern/libmv/third_party/gflags/gflags/gflags.h @@ -86,7 +86,7 @@ // We always want to export variables defined in user code #ifndef GFLAGS_DLL_DEFINE_FLAG -# ifdef _MSC_VER +# if 0 && defined(_MSC_VER) # define GFLAGS_DLL_DEFINE_FLAG __declspec(dllexport) # else # define GFLAGS_DLL_DEFINE_FLAG diff --git a/extern/libmv/third_party/gflags/gflags/gflags_declare.h b/extern/libmv/third_party/gflags/gflags/gflags_declare.h index c390d30332b..335c389b610 100644 --- a/extern/libmv/third_party/gflags/gflags/gflags_declare.h +++ b/extern/libmv/third_party/gflags/gflags/gflags_declare.h @@ -42,7 +42,7 @@ // We always want to import the symbols of the gflags library #ifndef GFLAGS_DLL_DECL -# if 1 && defined(_MSC_VER) +# if 0 && defined(_MSC_VER) # define GFLAGS_DLL_DECL __declspec(dllimport) # else # define GFLAGS_DLL_DECL @@ -51,7 +51,7 @@ // We always want to import variables declared in user code #ifndef GFLAGS_DLL_DECLARE_FLAG -# ifdef _MSC_VER +# if 0 && defined(_MSC_VER) # define GFLAGS_DLL_DECLARE_FLAG __declspec(dllimport) # else # define GFLAGS_DLL_DECLARE_FLAG |