Merge pull request #1602 from damon-kwok/master

error fix for msys+gcc9.1.0
This commit is contained in:
Dirk-Jan C. Binnema 2020-02-29 15:01:05 +02:00 committed by GitHub
commit 17f38dc4c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions

2
.gitignore vendored
View File

@ -49,6 +49,8 @@ GTAGS
*.gcda
*.gcno
*.trs
*.exe
*.lib
aminclude_static.am
elisp-comp
elc-stamp

View File

@ -26,7 +26,7 @@
#include <unordered_map>
#include <atomic>
#include <iostream>
#include <cstring>
#include "mu-store.hh"
#include "utils/mu-str.h"
#include "utils/mu-error.hh"

View File

@ -25,7 +25,7 @@
#include <string>
#include <algorithm>
#include <atomic>
#include <cstring>
#include <glib.h>
#include <glib/gprintf.h>
@ -87,7 +87,7 @@ install_sig_handler (void)
for (i = 0; i != G_N_ELEMENTS(sigs); ++i)
if (sigaction (sigs[i], &action, NULL) != 0)
g_critical ("set sigaction for %d failed: %s",
sigs[i], strerror (errno));;
sigs[i], g_strerror (errno));;
}
@ -155,7 +155,7 @@ print_expr (const char* frm, ...)
rv = write (outfd, "\n", 1);
if (rv == -1) {
g_critical ("%s: write() failed: %s",
__func__, strerror(errno));
__func__, g_strerror(errno));
/* terminate ourselves */
raise (SIGTERM);
}