diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-13 07:00:00 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-13 07:00:00 +0000 |
| commit | bcf30daebbcc274951e7806e24b19d4a993cd22f (patch) | |
| tree | 65bdb2a09ab463067913d1a43f02eb850f4ab81a /sdch | |
| parent | 837c93968ee1ab03bbc56e23ac2c8276ef87a816 (diff) | |
| download | chromium_src-bcf30daebbcc274951e7806e24b19d4a993cd22f.zip chromium_src-bcf30daebbcc274951e7806e24b19d4a993cd22f.tar.gz chromium_src-bcf30daebbcc274951e7806e24b19d4a993cd22f.tar.bz2 | |
Fix 2010e compile by adding intsafe_workaround to SDCH.
Patch from joaodasilva.
BUG=308740
R=scottmg@chromium.org
TBR=wtc@chromium.org
Review URL: https://codereview.chromium.org/136083002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sdch')
| -rw-r--r-- | sdch/sdch.gyp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp index 2e74aa5..af65409 100644 --- a/sdch/sdch.gyp +++ b/sdch/sdch.gyp @@ -85,8 +85,16 @@ # ForcedIncludeFiles is relative to include_dirs, cflags relative to the # build directory. 'xcode_settings': { 'GCC_PREFIX_HEADER': '<(logging_path)' }, + 'msvs_system_include_dirs': [ + '<(DEPTH)/build', + ], 'msvs_settings': { - 'VCCLCompilerTool': { 'ForcedIncludeFiles': [ 'sdch/<(logging_path)' ] } + 'VCCLCompilerTool': { + 'ForcedIncludeFiles': [ + 'intsafe_workaround.h', # http://crbug.com/308740 + 'sdch/<(logging_path)', + ] + } }, 'cflags': [ '-include', '<(logging_dir)/sdch/<(logging_path)' ], }, |