Merge branch 'upstream-KWSys' into win-no-error-popup

* upstream-KWSys:
  KWSys 2019-11-15 (329d8c7c)
This commit is contained in:
Brad King 2019-11-15 09:20:47 -05:00
commit 0b9f1cc96b

View File

@ -4666,8 +4666,12 @@ void SystemTools::ClassFinalize()
# include <stdlib.h>
namespace KWSYS_NAMESPACE {
static int SystemToolsDebugReport(int, char* message, int*)
static int SystemToolsDebugReport(int, char* message, int* ret)
{
if (ret) {
// Pretend user clicked on Retry button in popup.
*ret = 1;
}
fprintf(stderr, "%s", message);
fflush(stderr);
return 1; // no further reporting required