Merge pull request #632 from 1ace/refactor/log

Refactor preprocessor logic out of _sway_log()

1 files changed, 3 insertions, 3 deletions

diff --git a/include/log.h b/include/log.h
index 268783f4..efacf90f 100644
--- a/include/log.h
+++ b/include/log.h
@@ -22,14 +22,14 @@ bool _sway_assert(bool condition, const char* format, ...) __attribute__((format
 #define sway_assert(COND, FMT, ...) \
         _sway_assert(COND, "%s:" FMT, __PRETTY_FUNCTION__, ##__VA_ARGS__)
 
-#ifndef NDEBUG
 void _sway_log(const char *filename, int line, log_importance_t verbosity, const char* format, ...) __attribute__((format(printf,4,5)));
+
+#ifndef NDEBUG
 #define sway_log(VERBOSITY, FMT, ...) \
         _sway_log(__FILE__, __LINE__, VERBOSITY, FMT, ##__VA_ARGS__)
 #else
-void _sway_log(log_importance_t verbosity, const char* format, ...) __attribute__((format(printf,2,3)));
 #define sway_log(VERBOSITY, FMT, ...) \
-        _sway_log(VERBOSITY, FMT, ##__VA_ARGS__)
+        _sway_log(NULL, 0, VERBOSITY, FMT, ##__VA_ARGS__)
 #endif
 
 void error_handler(int sig);