diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 21:30:43 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 21:30:43 +0000 |
| commit | 0704c869cacb125ab928739a9ce4dab7490d5ce5 (patch) | |
| tree | 37c9babf5bf7bc7000e7391acd42cdee2c02b1c6 /third_party/libjingle | |
| parent | 6da33e530ba30c2abd070011642815b9dd6530d6 (diff) | |
| download | chromium_src-0704c869cacb125ab928739a9ce4dab7490d5ce5.zip chromium_src-0704c869cacb125ab928739a9ce4dab7490d5ce5.tar.gz chromium_src-0704c869cacb125ab928739a9ce4dab7490d5ce5.tar.bz2 | |
fix/disable warnings in libjingle's configuration
- Don't define INT64_C, etc. on VS2010 and greater (they're defined in stdint.h which is included by basictypes.h)
- Suppress warning about WIN32_LEAN_AND_MEAN (Chromium build files set it globally, libjingle .cc files define it unconditionally).
BUG=126483
R=thakis@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/10310051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 2 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/basictypes.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index ae59743..74a16b2 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -372,6 +372,8 @@ 'source/talk/base/winping.cc', 'source/talk/base/winping.h', ], + # Suppress warnings about WIN32_LEAN_AND_MEAN. + 'msvs_disabled_warnings': [ 4005 ], }], ['os_posix == 1', { 'sources': [ diff --git a/third_party/libjingle/overrides/talk/base/basictypes.h b/third_party/libjingle/overrides/talk/base/basictypes.h index eeecc4b..8dc380b 100644 --- a/third_party/libjingle/overrides/talk/base/basictypes.h +++ b/third_party/libjingle/overrides/talk/base/basictypes.h @@ -19,12 +19,16 @@ typedef __int64 int64; #endif /* COMPILER_MSVC */ #ifdef COMPILER_MSVC +#if _MSC_VER < 1600 typedef unsigned __int64 uint64; typedef __int64 int64; #define INT64_C(x) x ## I64 #define UINT64_C(x) x ## UI64 #define INT64_F "I64" #else +#include <stdint.h> +#endif +#else #ifndef INT64_C #define INT64_C(x) x ## LL #endif |