[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0a0c2a001bf9cc73fcdb4b11c103d2b2bd591846
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 10:11:36 2010 +0000

    2010-11-02  Ryuan Choi  <ryuan.choi at samsung.com>
    
            Unreviewed build fix for EFL build with libcurl
    
            [EFL] remove multiple definition with libcurl
            https://bugs.webkit.org/show_bug.cgi?id=48499
    
            Add macro to isolate setCookieStoragePrivateBrowsingEnabled from EFL
            build because it was duplicated.
    
            * platform/network/curl/CookieJarCurl.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71105 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2c87671..da63c93 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-02  Ryuan Choi  <ryuan.choi at samsung.com>
+
+        Unreviewed build fix for EFL build with libcurl
+
+        [EFL] remove multiple definition with libcurl
+        https://bugs.webkit.org/show_bug.cgi?id=48499
+
+        Add macro to isolate setCookieStoragePrivateBrowsingEnabled from EFL
+        build because it was duplicated.
+
+        * platform/network/curl/CookieJarCurl.cpp:
+
 2010-11-02  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Joseph Pecoraro.
diff --git a/WebCore/platform/network/curl/CookieJarCurl.cpp b/WebCore/platform/network/curl/CookieJarCurl.cpp
index 6f8a6b7..36495d0 100644
--- a/WebCore/platform/network/curl/CookieJarCurl.cpp
+++ b/WebCore/platform/network/curl/CookieJarCurl.cpp
@@ -61,9 +61,11 @@ void deleteCookie(const Document*, const KURL&, const String&)
     // FIXME: Not yet implemented
 }
 
+#if !PLATFORM(EFL)
 void setCookieStoragePrivateBrowsingEnabled(bool enabled)
 {
     // FIXME: Not yet implemented
 }
+#endif
 
 }

-- 
WebKit Debian packaging