emacs/mu
1
0
Fork 0
mirror of https://github.com/djcb/mu.git synced 2024-06-29 07:51:04 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1602 from damon-kwok/master

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

2
lib/mu-store.cc
View File

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

6
mu/mu-cmd-server.cc
View File

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