summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/posix
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-05-11 18:35:50 +0100
committerBen Murdoch <benm@google.com>2010-05-14 10:23:05 +0100
commit21939df44de1705786c545cd1bf519d47250322d (patch)
treeef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/platform/posix
parent4ff1d8891d520763f17675827154340c7c740f90 (diff)
downloadexternal_webkit-21939df44de1705786c545cd1bf519d47250322d.zip
external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz
external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/platform/posix')
-rw-r--r--WebCore/platform/posix/FileSystemPOSIX.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/platform/posix/FileSystemPOSIX.cpp b/WebCore/platform/posix/FileSystemPOSIX.cpp
index ac8c7fa..ba17d39 100644
--- a/WebCore/platform/posix/FileSystemPOSIX.cpp
+++ b/WebCore/platform/posix/FileSystemPOSIX.cpp
@@ -116,6 +116,7 @@ bool truncateFile(PlatformFileHandle handle, long long offset)
return !ftruncate(handle, offset);
}
+#if !PLATFORM(ANDROID)
int writeToFile(PlatformFileHandle handle, const char* data, int length)
{
do {
@@ -125,6 +126,7 @@ int writeToFile(PlatformFileHandle handle, const char* data, int length)
} while (errno == EINTR);
return -1;
}
+#endif
int readFromFile(PlatformFileHandle handle, char* data, int length)
{