WebCore:
authorbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Jul 2009 16:53:21 +0000 (16:53 +0000)
committerbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Jul 2009 16:53:21 +0000 (16:53 +0000)
2009-07-24  Brent Fulgham  <bfulgham@webkit.org>

        Reviewed by Dave Hyatt.

        Clean up dependencies on Apple support libraries for non-Apple build.
        http://bugs.webkit.org/show_bug.cgi?id=27532.

        * platform/graphics/win/SimpleFontDataWin.cpp: Conditionalize references
          to ApplicationServices.h and WebKitSystemInterface.h

WebKit/win:

2009-07-24  Brent Fulgham  <bfulgham@webkit.org>

        Reviewed by Dave Hyatt.

        Clean up dependencies on Apple support libraries for non-Apple build.
        http://bugs.webkit.org/show_bug.cgi?id=27532.

        * DefaultDownloadDelegate.h: Conditionalize include of CFNetwork.h
        * WebDownload.h: Conditionalize include of CFNetwork.h
        * WebMutableURLRequest.cpp: Conditionalize include of CFNetwork.h

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@46359 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/graphics/win/SimpleFontDataWin.cpp
WebKit/win/ChangeLog
WebKit/win/DefaultDownloadDelegate.h
WebKit/win/WebDownload.h
WebKit/win/WebMutableURLRequest.cpp

index 892ed6f..92293c2 100644 (file)
@@ -1,3 +1,13 @@
+2009-07-24  Brent Fulgham  <bfulgham@webkit.org>
+
+        Reviewed by Dave Hyatt.
+
+        Clean up dependencies on Apple support libraries for non-Apple build.
+        http://bugs.webkit.org/show_bug.cgi?id=27532.
+
+        * platform/graphics/win/SimpleFontDataWin.cpp: Conditionalize references
+          to ApplicationServices.h and WebKitSystemInterface.h
+
 2009-07-24  Dan Bernstein  <mitz@apple.com>
 
         Another attempted build fix 
index d4f096d..5a3244c 100644 (file)
 #include <wtf/MathExtras.h>
 #include <unicode/uchar.h>
 #include <unicode/unorm.h>
-#include <ApplicationServices/ApplicationServices.h>
 #include <mlang.h>
 #include <tchar.h>
+
+#if PLATFORM(CG)
+#include <ApplicationServices/ApplicationServices.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
 
 namespace WebCore {
 
index 0924a6d..fafb664 100644 (file)
@@ -1,3 +1,14 @@
+2009-07-24  Brent Fulgham  <bfulgham@webkit.org>
+
+        Reviewed by Dave Hyatt.
+
+        Clean up dependencies on Apple support libraries for non-Apple build.
+        http://bugs.webkit.org/show_bug.cgi?id=27532.
+
+        * DefaultDownloadDelegate.h: Conditionalize include of CFNetwork.h
+        * WebDownload.h: Conditionalize include of CFNetwork.h
+        * WebMutableURLRequest.cpp: Conditionalize include of CFNetwork.h
+
 2009-07-24  Andrei Popescu  <andreip@google.com>
 
         Reviewed by Anders Carlsson.
index 6175170..b8fb8a7 100644 (file)
 
 #include "COMPtr.h"
 #include "WebKit.h"
+#include <wtf/HashSet.h>
 
+#if USE(CFNETWORK)
 #include <CFNetwork/CFURLDownloadPriv.h>
-#include <wtf/HashSet.h>
+#endif
 
 class DefaultDownloadDelegate : public IWebDownloadDelegate
 {
index 0d80b80..58c13e9 100644 (file)
 
 #include "COMPtr.h"
 #include "WebKit.h"
-
-#include <CFNetwork/CFURLDownloadPriv.h>
 #include <WebCore/PlatformString.h>
 #include <wtf/RetainPtr.h>
 
+#if USE(CFNETWORK)
+#include <CFNetwork/CFURLDownloadPriv.h>
+#endif
+
 namespace WebCore {
     class KURL;
     class ResourceHandle;
index 947be1e..e529993 100644 (file)
@@ -30,7 +30,6 @@
 #include "WebKit.h"
 #include "MarshallingHelpers.h"
 #include "WebKit.h"
-#include <CFNetwork/CFURLRequestPriv.h>
 #pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/COMPtr.h>
 
 #include <wtf/RetainPtr.h>
 
+#if USE(CFNETWORK)
+#include <CFNetwork/CFURLRequestPriv.h>
+#endif
+
 using namespace WebCore;
 
 // IWebURLRequest ----------------------------------------------------------------