Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 770cd7c7 authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Fix host 64-bit build."

parents c4afc192 cf86e2f8

fastboot/fastboot.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

libziparchive/zip_archive_test.cc

+2 −2
Original line number Diff line number Diff line
@@ -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();

}