[Win] Unreviewed build fix.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Jun 2014 07:02:23 +0000 (07:02 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Jun 2014 07:02:23 +0000 (07:02 +0000)
Source/WebCore:
* platform/network/curl/ResourceRequest.h:
Include missing PassOwnPtr.h.

Source/WebKit:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
Fixed 64-bit linker symbol.

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

Source/WebCore/ChangeLog
Source/WebCore/platform/network/curl/ResourceRequest.h
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in

index 55da10b..f2af9b5 100644 (file)
@@ -1,3 +1,10 @@
+2014-06-11  Alex Christensen  <achristensen@webkit.org>
+
+        [Win] Unreviewed build fix.
+
+        * platform/network/curl/ResourceRequest.h:
+        Include missing PassOwnPtr.h.
+
 2014-06-10  Sam Weinig  <sam@webkit.org>
 
         Actually only generate tables for History and Location.
index a3bfba0..db34fea 100644 (file)
@@ -29,6 +29,8 @@
 
 #include "ResourceRequestBase.h"
 
+#include <wtf/PassOwnPtr.h>
+
 typedef const struct _CFURLRequest* CFURLRequestRef;
 
 namespace WebCore {
index eb4955f..5df63f3 100644 (file)
@@ -1,3 +1,10 @@
+2014-06-11  Alex Christensen  <achristensen@webkit.org>
+
+        [Win] Unreviewed build fix.
+
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+        Fixed 64-bit linker symbol.
+
 2014-06-04  Alex Christensen  <achristensen@webkit.org>
 
         Enable WebGL on Windows.
index 92c1f09..a81746c 100644 (file)
@@ -290,7 +290,7 @@ EXPORTS
         ?setMockScrollbarsEnabled@Settings@WebCore@@SAX_N@Z
         ?mockScrollbarsEnabled@Settings@WebCore@@SA_NXZ
         ?setUsesOverlayScrollbars@Settings@WebCore@@SAX_N@Z
-        symbolWithPointer(?setPageZoomFactor@Frame@WebCore@@QAEXM@Z, ?setPageZoomFactor@Frame@WebCore@@QAEXM@Z)
+        symbolWithPointer(?setPageZoomFactor@Frame@WebCore@@QAEXM@Z, ?setPageZoomFactor@Frame@WebCore@@QEAAXM@Z)
         symbolWithPointer(?setPageScaleFactor@Page@WebCore@@QAEXMABVIntPoint@2@_N@Z, ?setPageScaleFactor@Page@WebCore@@QEAAXMAEBVIntPoint@2@_N@Z)
         symbolWithPointer(?setPagination@Page@WebCore@@QAEXABUPagination@2@@Z, ?setPagination@Page@WebCore@@QEAAXAEBUPagination@2@@Z)
         symbolWithPointer(?setPictographFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z, ?setPictographFontFamily@Settings@WebCore@@QEAAXAEBVAtomicString@WTF@@W4UScriptCode@@@Z)