From 2b4d165daf077e11cafdcecfc2e33be2c6b689f4 Mon Sep 17 00:00:00 2001 From: "mbelshe@google.com" Date: Thu, 16 Apr 2009 20:08:05 +0000 Subject: JavaScriptCore is not using the webkit common defines. In particular the USE_SYSTEM_MALLOC macros aren't properly defined. This turns out to be benign in our current builds, but will be significant with my future checkins. Overall, this checkin doesn't change anything, except to get the right definitions in place for JSC. Review URL: http://codereview.chromium.org/79014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13871 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/build/JavaScriptCore/javascriptcore.vsprops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webkit/build') diff --git a/webkit/build/JavaScriptCore/javascriptcore.vsprops b/webkit/build/JavaScriptCore/javascriptcore.vsprops index fc65ddf..42dcc16 100644 --- a/webkit/build/JavaScriptCore/javascriptcore.vsprops +++ b/webkit/build/JavaScriptCore/javascriptcore.vsprops @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="javascriptcore" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops;.\using_javascriptcore.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops;.\using_javascriptcore.vsprops;..\webkit_common.vsprops" DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;$(TargetPath)" >