ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am b0501ab6: am 770cd7c7: Merge "Fix host 64-bit build."

Browse source 
* commit 'b0501ab66ddf82f5d3b6aa99734e14a1e27c916a':
  Fix host 64-bit build.
This commit is contained in:
Ying Wang 2014-05-17 01:38:10 +00:00 • committed by Android Git Automerger
commit 73d6dc5cdc
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fastboot/fastboot.c
View file

@ -32,6 +32,7 @@
#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
#include <inttypes.h>
#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
@ -576,7 +577,7 @@ static int64_t get_target_sparse_limit(struct usb_handle *usb)
if (!status) {
limit = strtoul(response, NULL, 0);
if (limit > 0) {
fprintf(stderr, "target reported max download size of %lld bytes\n",
fprintf(stderr, "target reported max download size of %" PRId64 " bytes\n",
limit);
}
}

4
libziparchive/zip_archive_test.cc
View file

@ -209,7 +209,8 @@ TEST(ziparchive, ExtractToFile) {
sizeof(kATxtContents)));
// Assert that the total length of the file is sane
ASSERT_EQ(data_size + sizeof(kATxtContents), lseek64(fd, 0, SEEK_END));
ASSERT_EQ(data_size + static_cast<ssize_t>(sizeof(kATxtContents)),
lseek64(fd, 0, SEEK_END));
close(fd);
}
@ -247,4 +248,3 @@ int main(int argc, char** argv) {
return RUN_ALL_TESTS();
}