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

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ed68d67f3c862f86c71735a30bb726cadf500a2d
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 03:47:54 2010 +0000

    2010-10-04  Simon Fraser  <simon.fraser at apple.com>
    
            No review.
    
            Touch cf/SocketStreamHandle.h and add an #ifdef to qt/SocketStreamHandle.h
            to fail at compile time if Mac includes that header.
    
            * platform/network/cf/SocketStreamHandle.h:
            * platform/network/qt/SocketStreamHandle.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69062 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7ceea95..b839850 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-10-04  Simon Fraser  <simon.fraser at apple.com>
 
+        No review.
+        
+        Touch cf/SocketStreamHandle.h and add an #ifdef to qt/SocketStreamHandle.h
+        to fail at compile time if Mac includes that header.
+
+        * platform/network/cf/SocketStreamHandle.h:
+        * platform/network/qt/SocketStreamHandle.h:
+
+2010-10-04  Simon Fraser  <simon.fraser at apple.com>
+
         Reviewed by Darin Adler.
 
         https://bugs.webkit.org/show_bug.cgi?id=47136
diff --git a/WebCore/platform/network/cf/SocketStreamHandle.h b/WebCore/platform/network/cf/SocketStreamHandle.h
index 63bf9a7..8643db7 100644
--- a/WebCore/platform/network/cf/SocketStreamHandle.h
+++ b/WebCore/platform/network/cf/SocketStreamHandle.h
@@ -36,6 +36,7 @@
 #include "SocketStreamHandleBase.h"
 #include <wtf/RetainPtr.h>
 
+
 namespace WebCore {
 
     class AuthenticationChallenge;
diff --git a/WebCore/platform/network/qt/SocketStreamHandle.h b/WebCore/platform/network/qt/SocketStreamHandle.h
index 5c55749..e725344 100644
--- a/WebCore/platform/network/qt/SocketStreamHandle.h
+++ b/WebCore/platform/network/qt/SocketStreamHandle.h
@@ -38,6 +38,10 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
+#if !PLATFORM(QT)
+#error This should only be built on Qt
+#endif
+
 namespace WebCore {
 
     class AuthenticationChallenge;

-- 
WebKit Debian packaging