[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[aroben at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit a2a051b2863379c8252ff81eec49c92cf3548f37
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 10 16:51:02 2010 +0000

    Remove unnecessary #include of shfolder.h
    
    shfolder.h has been deprecated in newer versions of the Windows SDK.
    
    Fixes <http://webkit.org/b/34803> WebPreferences.cpp fails to compile
    under VS2010 RC due to #include of shfolder.h.
    
    Reviewed by Darin Adler.
    
    * WebPreferences.cpp: Removed #include.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54604 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 8d6ecdf..bda0bab 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-10  Adam Roben  <aroben at apple.com>
+
+        Remove unnecessary #include of shfolder.h
+
+        shfolder.h has been deprecated in newer versions of the Windows SDK.
+
+        Fixes <http://webkit.org/b/34803> WebPreferences.cpp fails to compile
+        under VS2010 RC due to #include of shfolder.h.
+
+        Reviewed by Darin Adler.
+
+        * WebPreferences.cpp: Removed #include.
+
 2010-02-08  Charlie Reis  <creis at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/win/WebPreferences.cpp b/WebKit/win/WebPreferences.cpp
index c23f236..1553480 100644
--- a/WebKit/win/WebPreferences.cpp
+++ b/WebKit/win/WebPreferences.cpp
@@ -43,7 +43,6 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <limits>
 #include <shlobj.h>
-#include <shfolder.h>
 #include <tchar.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnArrayPtr.h>

-- 
WebKit Debian packaging