summaryrefslogtreecommitdiffstats
path: root/base/platform_file_posix.cc
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-11-01 12:19:54 +0000
committerIain Merrick <husky@google.com>2010-11-03 10:21:10 +0000
commit731df977c0511bca2206b5f333555b1205ff1f43 (patch)
tree0e750b949b3f00a1ac11fda25d3c2de512f2b465 /base/platform_file_posix.cc
parent5add15e10e7bb80512f2c597ca57221314abe577 (diff)
downloadexternal_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip
external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz
external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'base/platform_file_posix.cc')
-rw-r--r--base/platform_file_posix.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/platform_file_posix.cc b/base/platform_file_posix.cc
index f2cf320..b691f00 100644
--- a/base/platform_file_posix.cc
+++ b/base/platform_file_posix.cc
@@ -84,7 +84,8 @@ PlatformFile CreatePlatformFile(const FilePath& name, int flags,
}
}
- if (created && (descriptor > 0) && (flags & PLATFORM_FILE_CREATE_ALWAYS))
+ if (created && (descriptor > 0) &&
+ (flags & (PLATFORM_FILE_CREATE_ALWAYS | PLATFORM_FILE_CREATE)))
*created = true;
if ((descriptor > 0) && (flags & PLATFORM_FILE_DELETE_ON_CLOSE)) {