[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kevino at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 38a94a86c1535a836c3125a138a1a7d807b387ea
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 00:55:28 2010 +0000

    [wx] Build fix after introduction of JS_NO_EXPORT
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e0ad44e..7e924c2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-11  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix after introduction of JS_NO_EXPORT
+        
+        * wx/build/settings.py:
+
 2010-01-11  Eric Seidel  <eric at webkit.org>
 
         No review, rolling out r53079.
diff --git a/WebKitTools/wx/build/settings.py b/WebKitTools/wx/build/settings.py
index f7f75b6..8acb610 100644
--- a/WebKitTools/wx/build/settings.py
+++ b/WebKitTools/wx/build/settings.py
@@ -263,7 +263,7 @@ def common_configure(conf):
     if build_port == "wx":
         update_wx_deps(conf, wk_root, msvc_version)
     
-        conf.env.append_value('CXXDEFINES', ['BUILDING_WX__=1'])
+        conf.env.append_value('CXXDEFINES', ['BUILDING_WX__=1', 'JS_NO_EXPORT'])
 
         if building_on_win32:
             conf.env.append_value('LIBPATH', os.path.join(msvclibs_dir, 'lib'))

-- 
WebKit Debian packaging