[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 ec9ec755d87c7033306673dcd554728aad11e5b8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 23 12:54:29 2010 +0000

    2010-07-23  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Adam Roben.
    
            [WINCE] Buildfix for PluginDatabaseWin.cpp
            https://bugs.webkit.org/show_bug.cgi?id=41887
    
            Define KEY_ENUMERATE_SUB_KEYS only if not defined.
    
            * plugins/win/PluginDatabaseWin.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63966 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d913ba0..0180357 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-23  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Adam Roben.
+
+        [WINCE] Buildfix for PluginDatabaseWin.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=41887
+
+        Define KEY_ENUMERATE_SUB_KEYS only if not defined.
+
+        * plugins/win/PluginDatabaseWin.cpp:
+
 2010-07-23  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/plugins/win/PluginDatabaseWin.cpp b/WebCore/plugins/win/PluginDatabaseWin.cpp
index 71bcdb5..5d86117 100644
--- a/WebCore/plugins/win/PluginDatabaseWin.cpp
+++ b/WebCore/plugins/win/PluginDatabaseWin.cpp
@@ -40,7 +40,9 @@
 
 #if OS(WINCE)
 // WINCE doesn't support Registry Key Access Rights. The parameter should always be 0
+#ifndef KEY_ENUMERATE_SUB_KEYS
 #define KEY_ENUMERATE_SUB_KEYS 0
+#endif
 
 DWORD SHGetValue(HKEY hkey, LPCWSTR pszSubKey, LPCWSTR pszValue, LPDWORD pdwType, LPVOID pvData, LPDWORD pcbData)
 {

-- 
WebKit Debian packaging