Merge "Fix Windows build."

This commit is contained in:
Elliott Hughes 2015-02-05 03:40:07 +00:00 committed by Gerrit Code Review
commit 6c3ff4fe7f

View file

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