[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4da54e5dba8d99724885f5d75df847661f99aa5c
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 01:11:04 2010 +0000

    2010-12-23  Patrick Gansterer  <paroga at webkit.org>
    
            Unreviewed build fix for WinCE after r73802.
    
            Reapply r70812:
            Port ContextMenuItemWin.cpp to WinCE
            https://bugs.webkit.org/show_bug.cgi?id=48407
    
            * platform/win/ContextMenuItemWin.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74596 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 227b3f9..9a589a8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-23  Patrick Gansterer  <paroga at webkit.org>
+
+        Unreviewed build fix for WinCE after r73802.
+
+        Reapply r70812:
+        Port ContextMenuItemWin.cpp to WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=48407
+
+        * platform/win/ContextMenuItemWin.cpp:
+
 2010-12-23  Adam Barth  <abarth at webkit.org>
 
         Remove include of non-existant file.
diff --git a/WebCore/platform/win/ContextMenuItemWin.cpp b/WebCore/platform/win/ContextMenuItemWin.cpp
index 59aedcd..a19fb9b 100644
--- a/WebCore/platform/win/ContextMenuItemWin.cpp
+++ b/WebCore/platform/win/ContextMenuItemWin.cpp
@@ -28,6 +28,18 @@
 
 #include "ContextMenu.h"
 
+#if OS(WINCE)
+#ifndef MFS_DISABLED
+#define MFS_DISABLED MF_GRAYED
+#endif
+#ifndef MIIM_FTYPE
+#define MIIM_FTYPE MIIM_TYPE
+#endif
+#ifndef MIIM_STRING
+#define MIIM_STRING 0
+#endif
+#endif
+
 namespace WebCore {
 
 ContextMenuItem::ContextMenuItem(const MENUITEMINFO& info)

-- 
WebKit Debian packaging