From 3fef603b65dea11496ffc8f7c60140135682ad1f Mon Sep 17 00:00:00 2001 From: Ivan Penkov Date: Tue, 30 Aug 2016 13:14:19 -0700 Subject: Fixing some casts in order to be able to build with new Xcode and SDK versions (tested with Xcode 7.3, SDK 10.11). Patch provided by Thomas Schweitzer. BUG= Change-Id: Ib35cdf766e73e4936e66f75474d83c2602f8ceb4 Reviewed-on: https://chromium-review.googlesource.com/378059 Reviewed-by: Mark Mentovai --- src/tools/mac/dump_syms/macho_dump.cc | 8 ++++++-- src/tools/mac/symupload/minidump_upload.m | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/tools') diff --git a/src/tools/mac/dump_syms/macho_dump.cc b/src/tools/mac/dump_syms/macho_dump.cc index 4402bf4e..d882bbe8 100644 --- a/src/tools/mac/dump_syms/macho_dump.cc +++ b/src/tools/mac/dump_syms/macho_dump.cc @@ -138,8 +138,12 @@ void DumpFile(const char *filename) { } printf("filename: %s\n", filename); size_t object_files_size; - const struct fat_arch *object_files - = fat_reader.object_files(&object_files_size); + const SuperFatArch* super_fat_object_files = + fat_reader.object_files(&object_files_size); + struct fat_arch *object_files; + if (!super_fat_object_files->ConvertToFatArch(object_files)) { + exit(1); + } printf(" object file count: %ld\n", object_files_size); for (size_t i = 0; i < object_files_size; i++) { const struct fat_arch &file = object_files[i]; diff --git a/src/tools/mac/symupload/minidump_upload.m b/src/tools/mac/symupload/minidump_upload.m index 991a5de5..741ad765 100644 --- a/src/tools/mac/symupload/minidump_upload.m +++ b/src/tools/mac/symupload/minidump_upload.m @@ -68,8 +68,8 @@ static void Start(Options *options) { encoding:NSUTF8StringEncoding]; NSLog(@"Send: %@", error ? [error description] : @"No Error"); - NSLog(@"Response: %d", [[ul response] statusCode]); - NSLog(@"Result: %d bytes\n%@", [data length], result); + NSLog(@"Response: %ld", (long)[[ul response] statusCode]); + NSLog(@"Result: %lu bytes\n%@", (unsigned long)[data length], result); [result release]; [ul release]; -- cgit v1.2.1