Merge branch 'github/10.1' into 10.2

This commit is contained in:
Sergei Golubchik 2018-02-06 14:50:50 +01:00
commit 4771ae4b22
466 changed files with 9384 additions and 3636 deletions

View file

@ -1237,7 +1237,7 @@ static int write_log(const char *message, size_t len)
if (output_type == OUTPUT_FILE)
{
if (logfile &&
(is_active= (logger_write(logfile, message, len) == len)))
(is_active= (logger_write(logfile, message, len) == (int)len)))
return 0;
++log_write_failures;
return 1;