dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation on 32 bit windows due to type mismatches.

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-09-12 20:36:20 +01:00
parent d7853db2fd
commit 1ee1c6201a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/windows/crashlog_win.cpp
View File

@@ -443,7 +443,7 @@ char *CrashLogWindows::AppendDecodedStacktrace(char *buffer, const char *last) c
} else if (image_name != NULL) { } else if (image_name != NULL) {
#if defined (WITH_BFD) #if defined (WITH_BFD)
/* subtract one to get the line before the return address, i.e. the function call line */ /* subtract one to get the line before the return address, i.e. the function call line */
sym_info_bfd bfd_info(reinterpret_cast<bfd_vma>(frame.AddrPC.Offset) - 1); sym_info_bfd bfd_info(static_cast<bfd_vma>(frame.AddrPC.Offset) - 1);
lookup_addr_bfd(image_name, bfd_info); lookup_addr_bfd(image_name, bfd_info);
if (bfd_info.function_name != NULL) { if (bfd_info.function_name != NULL) {
const char *func_name = bfd_info.function_name; const char *func_name = bfd_info.function_name;
@@ -462,7 +462,7 @@ char *CrashLogWindows::AppendDecodedStacktrace(char *buffer, const char *last) c
free(demangled); free(demangled);
#endif #endif
if (symbol_ok && bfd_info.function_addr) { if (symbol_ok && bfd_info.function_addr) {
buffer += seprintf(buffer, last, " + %I64u", reinterpret_cast<bfd_vma>(frame.AddrPC.Offset) - bfd_info.function_addr); buffer += seprintf(buffer, last, " + %I64u", frame.AddrPC.Offset - static_cast<DWORD64>(bfd_info.function_addr));
} }
} }
if (bfd_info.file_name != NULL) { if (bfd_info.file_name != NULL) {