am 6c3ff4fe: Merge "Fix Windows build."

* commit '6c3ff4fe7f0b1cd729bf61974dde845b611b99c0':
  Fix Windows build.
This commit is contained in:
Elliott Hughes 2015-02-05 18:47:24 +00:00 committed by Android Git Automerger
commit 984e01e54e

View file

@ -70,6 +70,7 @@ static bool CleanUpAfterFailedWrite(const std::string& path) {
return false;
}
#if !defined(_WIN32)
bool android::WriteStringToFile(const std::string& content, const std::string& path,
mode_t mode, uid_t owner, gid_t group) {
int fd = TEMP_FAILURE_RETRY(open(path.c_str(),
@ -85,6 +86,7 @@ bool android::WriteStringToFile(const std::string& content, const std::string& p
}
return CleanUpAfterFailedWrite(path);
}
#endif
bool android::WriteStringToFile(const std::string& content, const std::string& path) {
int fd = TEMP_FAILURE_RETRY(open(path.c_str(),