Another attempt to fix the Windows build following <http://trac.webkit.org/changeset...
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Jan 2014 00:43:37 +0000 (00:43 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Jan 2014 00:43:37 +0000 (00:43 +0000)
(https://bugs.webkit.org/show_bug.cgi?id=126654)

* platform/network/cf/ResourceRequest.h: Always declare ResourceRequest::updateFromDelegatePreservingOldHTTPBody()
instead of only declaring it when building without CFNetwork.

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

Source/WebCore/ChangeLog
Source/WebCore/platform/network/cf/ResourceRequest.h

index bd19f28..87c54df 100644 (file)
@@ -1,5 +1,13 @@
 2014-01-09  Daniel Bates  <dabates@apple.com>
 
+        Another attempt to fix the Windows build following <http://trac.webkit.org/changeset/161589>
+        (https://bugs.webkit.org/show_bug.cgi?id=126654)
+
+        * platform/network/cf/ResourceRequest.h: Always declare ResourceRequest::updateFromDelegatePreservingOldHTTPBody()
+        instead of only declaring it when building without CFNetwork.
+
+2014-01-09  Daniel Bates  <dabates@apple.com>
+
         Attempt to fix the Windows build following <http://trac.webkit.org/changeset/161589>
         (https://bugs.webkit.org/show_bug.cgi?id=126654)
 
index 3b89f3b..2a26d5a 100644 (file)
@@ -100,9 +100,9 @@ namespace WebCore {
             , m_nsRequest(nsRequest)
         {
         }
+#endif
 
         void updateFromDelegatePreservingOldHTTPBody(const ResourceRequest&);
-#endif
 
 #if PLATFORM(MAC)
         void applyWebArchiveHackForMail();