summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-09-05 21:44:52 -0400
committerLibravatar GitHub <noreply@github.com>2018-09-05 21:44:52 -0400
commit97474f12e371c7b92c57f1f107897c29f0f704b2 (patch)
treed27b48ac1f7319ba8fce5979c49a48ee51550770
parentMerge pull request #2579 from RyanDwyer/adjust-container-box (diff)
parentRemove __PRETTY_FUNCTION__ (diff)
downloadsway-97474f12e371c7b92c57f1f107897c29f0f704b2.tar.gz
sway-97474f12e371c7b92c57f1f107897c29f0f704b2.tar.zst
sway-97474f12e371c7b92c57f1f107897c29f0f704b2.zip
Merge pull request #2582 from ascent12/func
Remove __PRETTY_FUNCTION__
-rw-r--r--include/log.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/log.h b/include/log.h
index dd526143..6fb2f277 100644
--- a/include/log.h
+++ b/include/log.h
@@ -15,7 +15,7 @@ void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2);
15 15
16bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3); 16bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3);
17#define sway_assert(COND, FMT, ...) \ 17#define sway_assert(COND, FMT, ...) \
18 _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__, __func__, ##__VA_ARGS__)
19 19
20void error_handler(int sig); 20void error_handler(int sig);
21 21