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

barraclough at apple.com barraclough at apple.com
Wed Dec 22 12:05:50 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit bc0c4c2aa01367c05d68ac0ba378915429dc0ab4
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 14 02:23:43 2010 +0000

    Windows build fix.
    
    * WebCore.xcodeproj/project.pbxproj:
    * platform/win/SharedBufferWin.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65349 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 91d8205..603775c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-13  Gavin Barraclough  <barraclough at apple.com>
 
+        Windows build fix.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/win/SharedBufferWin.cpp:
+
+2010-08-13  Gavin Barraclough  <barraclough at apple.com>
+
         Rubber stamped by Sam Weinig.
         Switch String::/UString::ascii() to return a CString.
 
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index dbb89fe..f12bcc2 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -20222,7 +20222,6 @@
 			isa = PBXProject;
 			buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
 			compatibilityVersion = "Xcode 2.4";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
diff --git a/WebCore/platform/win/SharedBufferWin.cpp b/WebCore/platform/win/SharedBufferWin.cpp
index bbecb86..59a5a76 100644
--- a/WebCore/platform/win/SharedBufferWin.cpp
+++ b/WebCore/platform/win/SharedBufferWin.cpp
@@ -29,6 +29,7 @@
 
 #include "config.h"
 #include "SharedBuffer.h"
+#include <wtf/text/CString.h>
 
 // INVALID_FILE_SIZE is not defined on WinCE.
 #ifndef INVALID_FILE_SIZE

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list