ALL: Sync with ScummVM - rev. 2586ca2345

This commit is contained in:
Bastien Bouclet 2018-07-31 18:24:44 +02:00
parent ff56446d6a
commit 53759fe53a
214 changed files with 17297 additions and 12700 deletions

View file

@ -28,13 +28,13 @@
namespace Common {
static OutputFormatter s_errorOutputFormatter = 0;
static OutputFormatter s_errorOutputFormatter = nullptr;
void setErrorOutputFormatter(OutputFormatter f) {
s_errorOutputFormatter = f;
}
static ErrorHandler s_errorHandler = 0;
static ErrorHandler s_errorHandler = nullptr;
void setErrorHandler(ErrorHandler handler) {
s_errorHandler = handler;