From 09df67311f4621cc7504e2281d90241e7605a278 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 28 Aug 2017 10:26:23 +0300 Subject: Fix MSVC build on 64-bit Mostly int<->size_t implicit conversions. Warning 4366 (The result of the unary '&' operator may be unaligned) appears in minidump.cc:907, but I don't know why. It looks aligned to me. Change-Id: I641942adc324f8f9832b20662083dc83498688a8 Reviewed-on: https://chromium-review.googlesource.com/637390 Reviewed-by: Mike Frysinger --- src/tools/windows/converter/ms_symbol_server_converter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools') diff --git a/src/tools/windows/converter/ms_symbol_server_converter.cc b/src/tools/windows/converter/ms_symbol_server_converter.cc index dd3f770f..71b77097 100644 --- a/src/tools/windows/converter/ms_symbol_server_converter.cc +++ b/src/tools/windows/converter/ms_symbol_server_converter.cc @@ -73,7 +73,7 @@ bool GUIDOrSignatureIdentifier::InitializeFromString( if (length > 32 && length <= 40) { // GUID if (SSCANF(identifier.c_str(), - "%08X%04X%04X%02X%02X%02X%02X%02X%02X%02X%02X%X", + "%08X%04hX%04hX%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX%X", &guid_.Data1, &guid_.Data2, &guid_.Data3, &guid_.Data4[0], &guid_.Data4[1], &guid_.Data4[2], &guid_.Data4[3], @@ -500,7 +500,7 @@ MSSymbolServerConverter::LocateAndConvertSymbolFile( if (!WindowsStringUtils::safe_mbstowcs(pdb_file, &pdb_file_w)) { fprintf(stderr, "LocateAndConvertSymbolFile: " - "WindowsStringUtils::safe_mbstowcs failed for %s\n", + "WindowsStringUtils::safe_mbstowcs failed for %ws\n", pdb_file_w.c_str()); return LOCATE_FAILURE; } -- cgit v1.2.1