diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:12:21 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:12:21 +0000 |
| commit | d758e637ec2746870ca221d501d4726242f06c3e (patch) | |
| tree | 9af116aa129b787d50cae684fbc594dc80f704b8 | |
| parent | 4e88e35e5ba9a6d11711ec34f5896647f8861c65 (diff) | |
| download | chromium_src-d758e637ec2746870ca221d501d4726242f06c3e.zip chromium_src-d758e637ec2746870ca221d501d4726242f06c3e.tar.gz chromium_src-d758e637ec2746870ca221d501d4726242f06c3e.tar.bz2 | |
Roll Clang 167488:168474.
BUG=163104
Review URL: https://chromiumcodereview.appspot.com/11412302
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171017 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/process_proxy/process_output_watcher.cc | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 11 | ||||
| -rwxr-xr-x | tools/clang/scripts/update.sh | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/process_proxy/process_output_watcher.cc b/chrome/browser/chromeos/process_proxy/process_output_watcher.cc index 9c5191c..b89537a 100644 --- a/chrome/browser/chromeos/process_proxy/process_output_watcher.cc +++ b/chrome/browser/chromeos/process_proxy/process_output_watcher.cc @@ -26,7 +26,7 @@ void InitReadFdSet(int out_fd, int stop_fd, fd_set* set) { void CloseFd(int* fd) { if (*fd >= 0) { - if (HANDLE_EINTR(close(*fd) != 0)) + if (HANDLE_EINTR(close(*fd)) != 0) DPLOG(WARNING) << "close fd " << *fd << " failed."; } *fd = -1; diff --git a/skia/skia.gyp b/skia/skia.gyp index b845456..3de2d1b 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -255,6 +255,17 @@ 'SK_SUPPORT_GPU=0', ], }], + ['clang == 1', { + # TODO(hans): Remove once Skia rolls past r6641. + 'cflags': [ + '-Wno-tautological-constant-out-of-range-compare', + ], + 'xcode_settings': { + 'WARNING_CFLAGS': [ + '-Wno-tautological-constant-out-of-range-compare', + ], + } + }], ['release_valgrind_build == 1', { 'defines': [ 'SK_DEBUG_PATH_REF=1', diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index 6deec6a..d1bf1d8 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -8,7 +8,7 @@ # Do NOT CHANGE this if you don't know what you're doing -- see # https://code.google.com/p/chromium/wiki/UpdatingClang # Reverting problematic clang rolls is safe, though. -CLANG_REVISION=167488 +CLANG_REVISION=168474 THIS_DIR="$(dirname "${0}")" LLVM_DIR="${THIS_DIR}/../../../third_party/llvm" |