diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /JavaScriptCore/JavaScriptCore.gyp | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'JavaScriptCore/JavaScriptCore.gyp')
| -rw-r--r-- | JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp index 32270e8..ff7f0de 100644 --- a/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp +++ b/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp @@ -125,6 +125,16 @@ '../', '../wtf', ], + # Some warnings occur in JSC headers, so they must also be disabled + # in targets that use JSC. + 'msvs_disabled_warnings': [ + # Don't complain about calling specific versions of templatized + # functions (e.g. in RefPtrHashMap.h). + 4344, + # Don't complain about using "this" in an initializer list + # (e.g. in StringImpl.h). + 4355, + ], }, 'export_dependent_settings': [ 'wtf_config', @@ -137,7 +147,9 @@ 'sources/': [ ['exclude', 'ThreadIdentifierDataPthreads\\.(h|cpp)$'], ['exclude', 'ThreadingPthreads\\.cpp$'], - ['include', 'Thread(ing|Specific)Win\\.cpp$'] + ['include', 'Thread(ing|Specific)Win\\.cpp$'], + ['exclude', 'OSAllocatorPosix\\.cpp$'], + ['include', 'OSAllocatorWin\\.cpp$'] ], 'include_dirs!': [ '<(SHARED_INTERMEDIATE_DIR)/webkit', |