diff options
| author | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 20:58:24 +0000 |
|---|---|---|
| committer | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 20:58:24 +0000 |
| commit | c54b41cb226d9f394b8a5eec80aff813ea51d71c (patch) | |
| tree | 40fd86be89ee97a7c548a2301e0594678a9dfdb0 /third_party | |
| parent | 028f27eeee2ae781334bcfe25061e8d73d4fb66a (diff) | |
| download | chromium_src-c54b41cb226d9f394b8a5eec80aff813ea51d71c.zip chromium_src-c54b41cb226d9f394b8a5eec80aff813ea51d71c.tar.gz chromium_src-c54b41cb226d9f394b8a5eec80aff813ea51d71c.tar.bz2 | |
Retry of warnings-as-errors for Windows third_party.
Same as patch here: https://chromiumcodereview.appspot.com/10827429/
except that warnings as errors is off if buildtype=Official. The previous CL
was OK everywhere that's visible on build.chromium.org including "Official"
but fails on internal builds.
R=thakis@chromium.org
BUG=126483, 140121, 143877
Review URL: https://chromiumcodereview.appspot.com/10867058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/leveldatabase/env_chromium.cc | 3 | ||||
| -rw-r--r-- | third_party/lzma_sdk/CpuArch.h | 1 | ||||
| -rw-r--r-- | third_party/lzma_sdk/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/mesa/mesa.gyp | 3 | ||||
| -rw-r--r-- | third_party/qcms/qcms.gyp | 3 | ||||
| -rw-r--r-- | third_party/yasm/yasm.gyp | 3 |
6 files changed, 14 insertions, 2 deletions
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc index 6056de4..d1b4c26 100644 --- a/third_party/leveldatabase/env_chromium.cc +++ b/third_party/leveldatabase/env_chromium.cc @@ -252,8 +252,7 @@ class ChromiumEnv : public Env { public: ChromiumEnv(); virtual ~ChromiumEnv() { - fprintf(stderr, "Destroying Env::Default()\n"); - exit(1); + NOTREACHED(); } virtual Status NewSequentialFile(const std::string& fname, diff --git a/third_party/lzma_sdk/CpuArch.h b/third_party/lzma_sdk/CpuArch.h index 01930c7..8c0c84d 100644 --- a/third_party/lzma_sdk/CpuArch.h +++ b/third_party/lzma_sdk/CpuArch.h @@ -4,6 +4,7 @@ #ifndef __CPU_ARCH_H #define __CPU_ARCH_H +#include <stdlib.h> #include "Types.h" EXTERN_C_BEGIN diff --git a/third_party/lzma_sdk/README.chromium b/third_party/lzma_sdk/README.chromium index d487eec..c9ea02f 100644 --- a/third_party/lzma_sdk/README.chromium +++ b/third_party/lzma_sdk/README.chromium @@ -14,3 +14,6 @@ proper file paths and generate a static lib. The patch in chromium.patch was applied to CpuArch.c to fix compile error on 32bit Linux. + +An #include <stdlib.h> needs to be added to CpuArch.h to avoid a warning on +Win32. diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index 1ed392c..a7e475d 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -4,6 +4,9 @@ { 'variables': { + # Disable warnings as errors for mesa until they're fixed or disabled. + # http://crbug.com/143877 + 'win_third_party_warn_as_error': 'false', }, 'target_defaults': { 'conditions': [ diff --git a/third_party/qcms/qcms.gyp b/third_party/qcms/qcms.gyp index 01b9543..0208b1e 100644 --- a/third_party/qcms/qcms.gyp +++ b/third_party/qcms/qcms.gyp @@ -26,6 +26,9 @@ './src', ], }, + # Warning (sign-conversion) fixed upstream by large refactoring. Can be + # removed on next roll. + 'msvs_disabled_warnings': [ 4018 ], 'conditions': [ [ 'target_arch != "arm" and OS in ["linux", "freebsd", "openbsd", "solaris"]', { 'cflags': [ diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp index d981b50..9093600 100644 --- a/third_party/yasm/yasm.gyp +++ b/third_party/yasm/yasm.gyp @@ -71,6 +71,9 @@ 'genstring', 're2c', ], + # Patch to fix posted upstream, but not yet merged. + # https://github.com/yasm/yasm/pull/64 + 'msvs_disabled_warnings': [ 4018, 4090 ], 'sources': [ 'source/patched-yasm/frontends/yasm/yasm-options.c', 'source/patched-yasm/frontends/yasm/yasm.c', |