diff options
| -rw-r--r-- | ash/ash.gyp | 5 | ||||
| -rw-r--r-- | build/common.gypi | 14 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 6 | ||||
| -rw-r--r-- | ui/aura/aura.gyp | 5 | ||||
| -rw-r--r-- | ui/compositor/compositor.gyp | 5 | ||||
| -rw-r--r-- | ui/gfx/gfx.gyp | 6 | ||||
| -rw-r--r-- | ui/ui.gyp | 3 | ||||
| -rw-r--r-- | ui/views/views.gyp | 3 |
8 files changed, 14 insertions, 33 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 606f35ba..abb7234 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -675,11 +675,6 @@ 'test/test_metro_viewer_process_host.cc', 'test/test_metro_viewer_process_host.h', ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ], - }, - }, }], ], }, diff --git a/build/common.gypi b/build/common.gypi index 17dac2a..790ad3a 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -4434,6 +4434,20 @@ '<(windows_driver_kit_path)/inc/mfc42', ], }], + # Workaround for intsafe in 2010 Express + WDK. ATL code uses + # intsafe.h and both intsafe.h and stdint.h define INT8_MIN et al. + # We can't use this workaround in third_party code because it has + # various levels of intolerance for including stdint.h. + ['msvs_express and chromium_code', { + 'msvs_system_include_dirs': [ + '<(DEPTH)/build', + ], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'ForcedIncludeFiles': [ 'intsafe_workaround.h', ], + }, + }, + }], ], 'msvs_system_include_dirs': [ '<(windows_sdk_path)/Include/shared', diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index aa20474..c268d99 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -522,7 +522,6 @@ # /MP conflicts with #import directive so we limit the number # of processes to spawn to 1. 'AdditionalOptions': ['/MP1'], - 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ], }, }, }], @@ -2913,11 +2912,6 @@ '-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 diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index b062883..462acf1 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -124,11 +124,6 @@ 'sources!': [ 'input_state_lookup.cc', ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ], - }, - }, }], ], }, diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index affac2c..00c6873 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -131,11 +131,6 @@ 'test/test_utils.h', 'transform_animation_curve_adapter_unittest.cc', ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ], - }, - }, 'conditions': [ # osmesa GL implementation is used on linux. ['OS=="linux"', { diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp index 56c4d64..7ab68a1 100644 --- a/ui/gfx/gfx.gyp +++ b/ui/gfx/gfx.gyp @@ -337,12 +337,6 @@ # C4324 is structure was padded due to __declspec(align()), which is # uninteresting. 'msvs_disabled_warnings': [ 4267, 4324 ], - - 'msvs_settings': { - 'VCCLCompilerTool': { - 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ], - }, - }, }], ['OS=="android"', { 'sources!': [ @@ -459,9 +459,6 @@ 'dwmapi.lib', ], }, - 'VCCLCompilerTool': { - 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ], - }, }, 'link_settings': { 'libraries': [ diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 0013f93..548ee0c 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -576,9 +576,6 @@ 'user32.dll', ], }, - 'VCCLCompilerTool': { - 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ], - }, }, }, # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |