diff options
| author | Andy Schwerin <schwerin@10gen.com> | 2013-12-11 19:07:39 -0500 |
|---|---|---|
| committer | Andy Schwerin <schwerin@10gen.com> | 2013-12-11 19:07:39 -0500 |
| commit | 172bf6a4e24a65da9a6269507c2385c797d35cb7 (patch) | |
| tree | f3104ccaae750fa6225b619077a6f15dc01601f2 /src/mongo | |
| parent | 3c028606952aaa726e98859208f40b09e5cc4343 (diff) | |
| download | mongo-172bf6a4e24a65da9a6269507c2385c797d35cb7.tar.gz | |
Revert "SERVER-5214 Require Windows C++ driver consumers to link against the DLL version of the C++ runtime."
This reverts commit aac9e25fb096234bed6ea48217651a05afa9e10e, which currently
breaks the Windows build.
Diffstat (limited to 'src/mongo')
| -rw-r--r-- | src/mongo/client/dbclient.h | 5 | ||||
| -rw-r--r-- | src/mongo/util/version.cpp | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mongo/client/dbclient.h b/src/mongo/client/dbclient.h index 53749b66d65..9930688b81e 100644 --- a/src/mongo/client/dbclient.h +++ b/src/mongo/client/dbclient.h @@ -25,11 +25,6 @@ #error dbclient.h is for C++ driver consumer use only #endif -#if defined(_WIN32) && !defined(_DLL) -#error "Client applications linking against mongoclient.dll must link against the DLL version of " \ - "the C runtime. Compile with /MD or /MDd." -#endif // defined(_WIN32) && !defined(_DLL) - #define LIBMONGOCLIENT_CONSUMER #include "mongo/client/redef_macros.h" diff --git a/src/mongo/util/version.cpp b/src/mongo/util/version.cpp index 8b53e439c9d..c58d3ee407e 100644 --- a/src/mongo/util/version.cpp +++ b/src/mongo/util/version.cpp @@ -138,6 +138,9 @@ namespace mongo { ss << "not-scons win"; ss << " mscver:" << _MSC_FULL_VER << " built:" << __DATE__; ss << " boostver:" << BOOST_VERSION; +#if( !defined(_MT) ) +#error _MT is not defined +#endif ss << (sizeof(char *) == 8) ? " 64bit" : " 32bit"; return ss.str(); } |