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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b847dd501b54b8b8ee3770b6c875c180795cb01c
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 23 20:02:02 2010 +0000

    2010-10-23  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by David Kilzer.
    
            [WINCE] Port COMPtr.h to WinCE
            https://bugs.webkit.org/show_bug.cgi?id=48190
    
            Don't include guiddef.h on WinCE. It's not required and only creates build problems.
    
            * platform/win/COMPtr.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70398 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 61676ac..0d4841f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by David Kilzer.
 
+        [WINCE] Port COMPtr.h to WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=48190
+
+        Don't include guiddef.h on WinCE. It's not required and only creates build problems.
+
+        * platform/win/COMPtr.h:
+
+2010-10-23  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by David Kilzer.
+
         [WINCE] Rename SharedBitmap::createInstance to SharedBitmap::create
         https://bugs.webkit.org/show_bug.cgi?id=48180
 
diff --git a/WebCore/platform/win/COMPtr.h b/WebCore/platform/win/COMPtr.h
index 6b84256..95b53af 100644
--- a/WebCore/platform/win/COMPtr.h
+++ b/WebCore/platform/win/COMPtr.h
@@ -30,10 +30,13 @@
 #define NOMINMAX
 #endif
 
-#include <guiddef.h>
 #include <unknwn.h>
-#include <WTF/Assertions.h>
-#include <WTF/HashTraits.h>
+#include <wtf/Assertions.h>
+#include <wtf/HashTraits.h>
+
+#if !OS(WINCE)
+#include <guiddef.h>
+#endif
 
 typedef long HRESULT;
 

-- 
WebKit Debian packaging