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

Merge branch 'jgrpp' into jgrpp-nrt

Browse Source 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2019-08-24 10:41:08 +01:00
parent 7ed86e7488 12be6fd81f
commit 04ef407ddf
48 changed files with 568 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/macosx/crashlog_osx.cpp
View File

@@ -516,8 +516,8 @@ void CDECL HandleCrash(int signum, siginfo_t *si, void *context)
}
}
/* static */ void CrashLog::DesyncCrashLog(const std::string *log_in, std::string *log_out)
/* static */ void CrashLog::DesyncCrashLog(const std::string *log_in, std::string *log_out, const DesyncExtraInfo &info)
{
CrashLogOSX log(CrashLogOSX::DesyncTag{});
log.MakeDesyncCrashLog(log_in, log_out);
log.MakeDesyncCrashLog(log_in, log_out, info);
}

4
src/os/unix/crashlog_unix.cpp
View File

@@ -620,8 +620,8 @@ static void CDECL HandleCrash(int signum)
}
}
/* static */ void CrashLog::DesyncCrashLog(const std::string *log_in, std::string *log_out)
/* static */ void CrashLog::DesyncCrashLog(const std::string *log_in, std::string *log_out, const DesyncExtraInfo &info)
{
CrashLogUnix log(CrashLogUnix::DesyncTag{});
log.MakeDesyncCrashLog(log_in, log_out);
log.MakeDesyncCrashLog(log_in, log_out, info);
}

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

@@ -612,10 +612,10 @@ static void CDECL CustomAbort(int signal)
SetUnhandledExceptionFilter(ExceptionHandler);
}
/* static */ void CrashLog::DesyncCrashLog(const std::string *log_in, std::string *log_out)
/* static */ void CrashLog::DesyncCrashLog(const std::string *log_in, std::string *log_out, const DesyncExtraInfo &info)
{
CrashLogWindows log(nullptr);
log.MakeDesyncCrashLog(log_in, log_out);
log.MakeDesyncCrashLog(log_in, log_out, info);
}
/* The crash log GUI */