am 61ab1618: Merge "Fix 32-bit build."

* commit '61ab1618a8347c503e9185a4d17b957e367bac1b':
  Fix 32-bit build.
This commit is contained in:
Elliott Hughes 2015-08-25 18:15:51 +00:00 committed by Android Git Automerger
commit 3ecba7f95c

View file

@ -305,7 +305,9 @@ static bool do_send(int s, const std::string& spec, std::vector<char>& buffer) {
gid_t gid = -1;
uint64_t cap = 0;
if (should_use_fs_config(path)) {
fs_config(path.c_str(), 0, &uid, &gid, &mode, &cap);
unsigned int broken_api_hack;
fs_config(path.c_str(), 0, &uid, &gid, &broken_api_hack, &cap);
mode = broken_api_hack;
}
return handle_send_file(s, path.c_str(), uid, gid, mode, buffer, do_unlink);
}