diff options
| author |  Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-07-10 20:41:02 +1000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-10 20:41:02 +1000 |
| commit | 56ad148403d77a6defcbd6cd383dd5cde1a44954 (patch) | |
| tree | 9dc36287be4bed02c4e98e600f26f48ceff5d8d6 /common/log.c | |
| parent | Fix titlebar rendering for nested stacked containers (diff) | |
| parent | Merge pull request #2228 from emersion/focus-mode-toggle (diff) | |
| download | sway-56ad148403d77a6defcbd6cd383dd5cde1a44954.tar.gz sway-56ad148403d77a6defcbd6cd383dd5cde1a44954.tar.zst sway-56ad148403d77a6defcbd6cd383dd5cde1a44954.zip | |
Merge branch 'master' into fix-stacked-layout
Diffstat (limited to 'common/log.c')
| -rw-r--r-- | common/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/log.c b/common/log.c index 2cc7289c..847f3952 100644 --- a/common/log.c +++ b/common/log.c | |||
| @@ -8,7 +8,7 @@ void sway_terminate(int code); | |||
| 8 | void _sway_abort(const char *format, ...) { | 8 | void _sway_abort(const char *format, ...) { |
| 9 | va_list args; | 9 | va_list args; |
| 10 | va_start(args, format); | 10 | va_start(args, format); |
| 11 | _wlr_vlog(L_ERROR, format, args); | 11 | _wlr_vlog(WLR_ERROR, format, args); |
| 12 | va_end(args); | 12 | va_end(args); |
| 13 | sway_terminate(EXIT_FAILURE); | 13 | sway_terminate(EXIT_FAILURE); |
| 14 | } | 14 | } |
| @@ -20,7 +20,7 @@ bool _sway_assert(bool condition, const char *format, ...) { | |||
| 20 | 20 | ||
| 21 | va_list args; | 21 | va_list args; |
| 22 | va_start(args, format); | 22 | va_start(args, format); |
| 23 | _wlr_vlog(L_ERROR, format, args); | 23 | _wlr_vlog(WLR_ERROR, format, args); |
| 24 | va_end(args); | 24 | va_end(args); |
| 25 | 25 | ||
| 26 | #ifndef NDEBUG | 26 | #ifndef NDEBUG |