diff options
| author |  emersion <contact@emersion.fr> | 2018-02-24 23:29:08 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-24 23:29:08 +0100 |
| commit | 583c30dbe3e3249ec1b753fddbfa982db56dce31 (patch) | |
| tree | ce07d65ab79287280f1f5468e2e62eb5cbef4089 /include/log.h | |
| parent | Implement workspaces (diff) | |
| parent | static bfs queue (diff) | |
| download | sway-583c30dbe3e3249ec1b753fddbfa982db56dce31.tar.gz sway-583c30dbe3e3249ec1b753fddbfa982db56dce31.tar.zst sway-583c30dbe3e3249ec1b753fddbfa982db56dce31.zip | |
Merge pull request #1585 from acrisci/focus-overhaul
focus overhaul
Diffstat (limited to 'include/log.h')
| -rw-r--r-- | include/log.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/log.h b/include/log.h index 350a59ef..a9748127 100644 --- a/include/log.h +++ b/include/log.h | |||
| @@ -5,11 +5,11 @@ | |||
| 5 | 5 | ||
| 6 | void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2); | 6 | void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2); |
| 7 | #define sway_abort(FMT, ...) \ | 7 | #define sway_abort(FMT, ...) \ |
| 8 | _sway_abort("[%s:%d] " FMT, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__) | 8 | _sway_abort("[%s:%d] " FMT, wlr_strip_path(__FILE__), __LINE__, ##__VA_ARGS__) |
| 9 | 9 | ||
| 10 | bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3); | 10 | bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3); |
| 11 | #define sway_assert(COND, FMT, ...) \ | 11 | #define sway_assert(COND, FMT, ...) \ |
| 12 | _sway_assert(COND, "[%s:%d] %s:" FMT, _strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__) | 12 | _sway_assert(COND, "[%s:%d] %s:" FMT, wlr_strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__) |
| 13 | 13 | ||
| 14 | void error_handler(int sig); | 14 | void error_handler(int sig); |
| 15 | 15 | ||