summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 02:46:33 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-10 02:46:33 +0000
commit8f9c19f1c806c2a7019e3bb01848c93213e63598 (patch)
tree785c7c515a29242282770a4f2433db3e6cb459a3
parent8d127305a31b1c129d2cc40908f9fc6fc74a3c0f (diff)
downloadchromium_src-8f9c19f1c806c2a7019e3bb01848c93213e63598.zip
chromium_src-8f9c19f1c806c2a7019e3bb01848c93213e63598.tar.gz
chromium_src-8f9c19f1c806c2a7019e3bb01848c93213e63598.tar.bz2
disable c4267 in libpng for building on win x64
R=jschuh@chromium.org BUG=167187 Review URL: https://chromiumcodereview.appspot.com/11778076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175999 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--third_party/libpng/libpng.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
index 2a20b6b..789778b 100644
--- a/third_party/libpng/libpng.gyp
+++ b/third_party/libpng/libpng.gyp
@@ -60,6 +60,8 @@
'export_dependent_settings': [
'../zlib/zlib.gyp:zlib',
],
+ # TODO(jschuh): http://crbug.com/167187
+ 'msvs_disabled_warnings': [ 4267 ],
'conditions': [
['OS!="win"', {'product_name': 'png'}],
['OS=="win"', {