diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-09 16:23:03 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-09 16:23:03 -0700 |
commit | fbeef1322f5d10c1e2dac0d7de2358a59f442455 (patch) | |
tree | 76624b3d4820551261e5c15f773c403c1a41264e /include | |
parent | Merge pull request #2223 from RyanDwyer/floating-move (diff) | |
parent | Update for swaywm/wlroots#1126 (diff) | |
download | sway-fbeef1322f5d10c1e2dac0d7de2358a59f442455.tar.gz sway-fbeef1322f5d10c1e2dac0d7de2358a59f442455.tar.zst sway-fbeef1322f5d10c1e2dac0d7de2358a59f442455.zip |
Merge pull request #2234 from emersion/wlr-log-prefix
Update for swaywm/wlroots#1126
Diffstat (limited to 'include')
-rw-r--r-- | include/log.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/log.h b/include/log.h index a9748127..dd526143 100644 --- a/include/log.h +++ b/include/log.h | |||
@@ -3,13 +3,19 @@ | |||
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <wlr/util/log.h> | 4 | #include <wlr/util/log.h> |
5 | 5 | ||
6 | #ifdef __GNUC__ | ||
7 | #define ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end))) | ||
8 | #else | ||
9 | #define ATTRIB_PRINTF(start, end) | ||
10 | #endif | ||
11 | |||
6 | void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2); | 12 | void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2); |
7 | #define sway_abort(FMT, ...) \ | 13 | #define sway_abort(FMT, ...) \ |
8 | _sway_abort("[%s:%d] " FMT, wlr_strip_path(__FILE__), __LINE__, ##__VA_ARGS__) | 14 | _sway_abort("[%s:%d] " FMT, _wlr_strip_path(__FILE__), __LINE__, ##__VA_ARGS__) |
9 | 15 | ||
10 | bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3); | 16 | bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3); |
11 | #define sway_assert(COND, FMT, ...) \ | 17 | #define sway_assert(COND, FMT, ...) \ |
12 | _sway_assert(COND, "[%s:%d] %s:" FMT, wlr_strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__) | 18 | _sway_assert(COND, "[%s:%d] %s:" FMT, _wlr_strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__) |
13 | 19 | ||
14 | void error_handler(int sig); | 20 | void error_handler(int sig); |
15 | 21 | ||