diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-12-21 20:42:08 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-12-21 20:42:08 -0500 |
commit | 91c102a897467ff1bae345458ccf096e32e7bd15 (patch) | |
tree | 104c612d08afef1566c9b56f962641bb39c0dc1b /common/log.c | |
parent | Merge pull request #391 from mikkeloscar/trigger-workspace-ipc (diff) | |
parent | replace non-standard qsort_r with qsort (diff) | |
download | sway-91c102a897467ff1bae345458ccf096e32e7bd15.tar.gz sway-91c102a897467ff1bae345458ccf096e32e7bd15.tar.zst sway-91c102a897467ff1bae345458ccf096e32e7bd15.zip |
Merge pull request #393 from robotanarchy/musl-libc-compatibility
musl libc compatibility
Diffstat (limited to 'common/log.c')
-rw-r--r-- | common/log.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/common/log.c b/common/log.c index 02aac4c1..f9242bf4 100644 --- a/common/log.c +++ b/common/log.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <errno.h> | 10 | #include <errno.h> |
11 | #include <string.h> | 11 | #include <string.h> |
12 | #include <stringop.h> | 12 | #include <stringop.h> |
13 | #include <execinfo.h> | ||
14 | 13 | ||
15 | int colored = 1; | 14 | int colored = 1; |
16 | log_importance_t loglevel_default = L_ERROR; | 15 | log_importance_t loglevel_default = L_ERROR; |
@@ -137,6 +136,7 @@ bool _sway_assert(bool condition, const char* format, ...) { | |||
137 | } | 136 | } |
138 | 137 | ||
139 | void error_handler(int sig) { | 138 | void error_handler(int sig) { |
139 | #if SWAY_Backtrace_FOUND | ||
140 | int i; | 140 | int i; |
141 | int max_lines = 20; | 141 | int max_lines = 20; |
142 | void *array[max_lines]; | 142 | void *array[max_lines]; |
@@ -155,5 +155,8 @@ void error_handler(int sig) { | |||
155 | for (i = 0; (size_t)i < bt_len; i++) { | 155 | for (i = 0; (size_t)i < bt_len; i++) { |
156 | sway_log(L_ERROR, "Backtrace: %s", bt[i]); | 156 | sway_log(L_ERROR, "Backtrace: %s", bt[i]); |
157 | } | 157 | } |
158 | #else | ||
159 | sway_log(L_ERROR, "Error: Signal %d.", sig); | ||
160 | #endif | ||
158 | exit(1); | 161 | exit(1); |
159 | } | 162 | } |