diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-26 23:20:13 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-26 23:20:13 +0000 |
| commit | 9b98c97f70bdbd19360c52af0c68672c3789446f (patch) | |
| tree | 94af74621642fe4abbe4f10d536b4d9168e9c947 /webkit/SConscript | |
| parent | d7f5ecb907c01450b43762c588da5510694f5c40 (diff) | |
| download | chromium_src-9b98c97f70bdbd19360c52af0c68672c3789446f.zip chromium_src-9b98c97f70bdbd19360c52af0c68672c3789446f.tar.gz chromium_src-9b98c97f70bdbd19360c52af0c68672c3789446f.tar.bz2 | |
ActiveX changes part 2: remove old #defines, replace with new one.
Review URL: http://codereview.chromium.org/12506
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
| -rw-r--r-- | webkit/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index eca7cb8..d3d3d58 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -163,6 +163,7 @@ env.Append( ['ENABLE_JSC_MULTIPLE_THREADS', '0'], ['ENABLE_ICONDATABASE', '0'], ['ENABLE_DATABASE', '1'], + ['ENABLE_ACTIVEX_TYPE_CONVERSION_WMPLAYER', '0'], ['ENABLE_XSLT', '1'], ['ENABLE_XPATH', '1'], ['ENABLE_SVG', '1'], @@ -182,7 +183,6 @@ env.Append( 'PNG_USER_CONFIG', 'CHROME_PNG_WRITE_SUPPORT', ['__PRETTY_FUNCTION__', '__FUNCTION__'], - 'DISABLE_ACTIVEX_TYPE_CONVERSION_MPLAYER2', '__STD_C', ['USE_SYSTEM_MALLOC', '1'], |