[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
dumi at chromium.org
dumi at chromium.org
Thu Dec 3 13:34:27 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit d950c005383341dccd462577bacbf2758989275a
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 12 21:03:24 2009 +0000
Unreviewed, fix Chromium build after http://trac.webkit.org/changeset/50876.
* platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50895 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 95a038d..968b91d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-12 Dumitru Daniliuc <dumi at chromium.org>
+
+ Unreviewed, fix Chromium build after http://trac.webkit.org/changeset/50876.
+
+ * platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp:
+
2009-11-12 Eric Carlson <eric.carlson at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp b/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp
index 97226cb..ef4dfa7 100644
--- a/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp
+++ b/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp
@@ -92,7 +92,7 @@ int chromiumOpen(sqlite3_vfs* vfs, const char* fileName,
// The mask 0x00007F00 gives us the 7 bits that determine the type of the file SQLite is trying to open.
int fileType = desiredFlags & 0x00007F00;
int noLock = (fileType != SQLITE_OPEN_MAIN_DB);
- result = fillInUnixFile(vfs, fd, dirfd, id, fileName, noLock);
+ result = chromium_sqlite3_fill_in_unix_sqlite3_file(vfs, fd, dirfd, id, fileName, noLock);
if (result != SQLITE_OK)
chromium_sqlite3_destroy_reusable_file_handle(id);
return result;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list