commit f209292ff834a4d1cc0e2564233a03f6913fbd50
author Elliott Hughes <enh@google.com> Tue Aug 25 18:06:19 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 25 18:06:19 2015 +0000
tree f4e78937211da1f16f998addcc5446d608420c03
parent 077b14fcf05c5da52415dbcbe204af427f57b484
parent 175d5798d8e14728d714206bfa36175a833f20b0

Merge "Fix 32-bit build."

adb/file_sync_service.cpp

diff --git a/adb/file_sync_service.cpp b/adb/file_sync_service.cpp
index 6b5c51f..abf1c02 100644
--- a/adb/file_sync_service.cpp
+++ b/adb/file_sync_service.cpp
@@ -305,7 +305,9 @@
     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);
 }