summaryrefslogtreecommitdiffstats
path: root/webkit/build/WebCore
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-27 00:26:41 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-27 00:26:41 +0000
commitd2be5daed4cceee72eea47432343402374913bef (patch)
tree7f351a32f22241e402be1e4abf062699cb7364bc /webkit/build/WebCore
parent27b92e5a80057090bd8589649704e843d7a7b30b (diff)
downloadchromium_src-d2be5daed4cceee72eea47432343402374913bef.zip
chromium_src-d2be5daed4cceee72eea47432343402374913bef.tar.gz
chromium_src-d2be5daed4cceee72eea47432343402374913bef.tar.bz2
Reverting 6072.
Caused a slew of layout test crashes Review URL: http://codereview.chromium.org/12513 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/WebCore')
-rw-r--r--webkit/build/WebCore/webcore.vsprops2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/build/WebCore/webcore.vsprops b/webkit/build/WebCore/webcore.vsprops
index 9228690..e0b0446 100644
--- a/webkit/build/WebCore/webcore.vsprops
+++ b/webkit/build/WebCore/webcore.vsprops
@@ -7,7 +7,7 @@
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="__PRETTY_FUNCTION__=__FUNCTION__"
+ PreprocessorDefinitions="__PRETTY_FUNCTION__=__FUNCTION__;DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2"
DisableSpecificWarnings="4138; 4244; 4291; 4305; 4355; 4521; 4099;"
/>
</VisualStudioPropertySheet>