diff options
| author | Steve Block <steveblock@google.com> | 2010-05-05 10:39:32 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:14 +0100 |
| commit | 239e1c2422153f064b727eb7cd970d4327bcceb5 (patch) | |
| tree | 90dfdc51119e525572ed39d2287e4e9e3791f079 | |
| parent | 5fb15a120c24faef11e5952a791c5af38c54b07e (diff) | |
| download | external_webkit-239e1c2422153f064b727eb7cd970d4327bcceb5.zip external_webkit-239e1c2422153f064b727eb7cd970d4327bcceb5.tar.gz external_webkit-239e1c2422153f064b727eb7cd970d4327bcceb5.tar.bz2 | |
Merge webkit.org at r58033 : Cherry-pick WebKit change 58774 to avoid conflicts with FileSystemPOSIX.cpp
See http://trac.webkit.org/changeset/58774
Change-Id: I646d82752feaafaf0ece6e1cdd099ae2a200995e
| -rw-r--r-- | WebCore/platform/android/FileSystemAndroid.cpp | 8 | ||||
| -rw-r--r-- | WebCore/platform/posix/FileSystemPOSIX.cpp | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/WebCore/platform/android/FileSystemAndroid.cpp b/WebCore/platform/android/FileSystemAndroid.cpp index 80df73b..8a9777d 100644 --- a/WebCore/platform/android/FileSystemAndroid.cpp +++ b/WebCore/platform/android/FileSystemAndroid.cpp @@ -75,14 +75,6 @@ bool unloadModule(PlatformModule module) return !dlclose(module); } -void closeFile(PlatformFileHandle& handle) -{ - if (isHandleValid(handle)) { - close(handle); - handle = invalidPlatformFileHandle; - } -} - int writeToFile(PlatformFileHandle handle, const char* data, int length) { int totalBytesWritten = 0; 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) { |