summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 23:20:13 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 23:20:13 +0000
commite57fbabc6c462c84bd7bc12b1f0caa1f20f393e4 (patch)
treee5a3ccf0c9d27c46f098a27966c355f2aed5db9d /remoting
parent455e7d8424f4c82bf22f70bf9894d55c8df95592 (diff)
downloadchromium_src-e57fbabc6c462c84bd7bc12b1f0caa1f20f393e4.zip
chromium_src-e57fbabc6c462c84bd7bc12b1f0caa1f20f393e4.tar.gz
chromium_src-e57fbabc6c462c84bd7bc12b1f0caa1f20f393e4.tar.bz2
more intsafe fixes for automated toolchain (in remoting/)
These are needed when using 2010 Express. R=wez@chromium.org BUG=308740 Review URL: https://codereview.chromium.org/28913004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/remoting.gyp6
1 files changed, 6 insertions, 0 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index d32f837..97f7a742 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -522,6 +522,7 @@
# /MP conflicts with #import directive so we limit the number
# of processes to spawn to 1.
'AdditionalOptions': ['/MP1'],
+ 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ],
},
},
}],
@@ -2894,6 +2895,11 @@
'-lwtsapi32.lib',
],
},
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ],
+ },
+ },
}],
[ 'OS=="mac" or (OS=="linux" and chromeos==0)', {
# Javascript unittests are disabled on CrOS because they cause