diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/render/gles2.h | 2 | ||||
| -rw-r--r-- | include/wlr/util/log.h | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/include/render/gles2.h b/include/render/gles2.h index 7e0782d4..15653cac 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -98,7 +98,7 @@ struct wlr_gles2_texture *gles2_get_texture( void push_gles2_marker(const char *file, const char *func); void pop_gles2_marker(void); -#define PUSH_GLES2_DEBUG push_gles2_marker(_wlr_strip_path(__FILE__), __func__) +#define PUSH_GLES2_DEBUG push_gles2_marker(_WLR_FILENAME, __func__) #define POP_GLES2_DEBUG pop_gles2_marker() #endif diff --git a/include/wlr/util/log.h b/include/wlr/util/log.h index 2c441180..8eec425c 100644 --- a/include/wlr/util/log.h +++ b/include/wlr/util/log.h @@ -50,13 +50,19 @@ enum wlr_log_importance wlr_log_get_verbosity(void); void _wlr_log(enum wlr_log_importance verbosity, const char *format, ...) _WLR_ATTRIB_PRINTF(2, 3); void _wlr_vlog(enum wlr_log_importance verbosity, const char *format, va_list args) _WLR_ATTRIB_PRINTF(2, 0); -const char *_wlr_strip_path(const char *filepath); + +#ifdef WLR_REL_SRC_DIR +// strip prefix from __FILE__, leaving the path relative to the project root +#define _WLR_FILENAME ((const char *)__FILE__ + sizeof(WLR_REL_SRC_DIR) - 1) +#else +#define _WLR_FILENAME __FILE__ +#endif #define wlr_log(verb, fmt, ...) \ - _wlr_log(verb, "[%s:%d] " fmt, _wlr_strip_path(__FILE__), __LINE__, ##__VA_ARGS__) + _wlr_log(verb, "[%s:%d] " fmt, _WLR_FILENAME, __LINE__, ##__VA_ARGS__) #define wlr_vlog(verb, fmt, args) \ - _wlr_vlog(verb, "[%s:%d] " fmt, _wlr_strip_path(__FILE__), __LINE__, args) + _wlr_vlog(verb, "[%s:%d] " fmt, _WLR_FILENAME, __LINE__, args) #define wlr_log_errno(verb, fmt, ...) \ wlr_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno)) |