X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fassert.h;h=4e7151deae85f4980b0eda4d6c26ca6f589dd73f;hb=2c1d3e9111d8f1b55361b9b880350c2680c90093;hp=27fdeadbdac8de787fd9cbad12aefdfc61926312;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/src/common/assert.h b/src/common/assert.h
index 27fdeadb..4e7151de 100644
--- a/src/common/assert.h
+++ b/src/common/assert.h
@@ -25,7 +25,9 @@
  */
 
 #include <assert.h>
-#include "common/babeltrace.h"
+#include <glib.h>
+
+#include "common/macros.h"
 
 #ifdef BT_DEBUG_MODE
 
@@ -34,14 +36,15 @@ extern void bt_common_assert_failed(const char *file, int line,
 
 /*
  * Internal assertion (to detect logic errors on which the library user
- * has no influence). Use BT_ASSERT_PRE() to check a precondition which
- * must be directly or indirectly satisfied by the library user.
+ * has no influence). Use BT_ASSERT_PRE() or BT_ASSERT_POST() to check
+ * preconditions or postconditions which must be directly or indirectly
+ * satisfied by the library user.
  */
 #define BT_ASSERT(_cond)                                                       \
 	do {                                                                   \
 		if (!(_cond)) {                                                \
 			bt_common_assert_failed(__FILE__, __LINE__, __func__,  \
-				TOSTRING(_cond));                              \
+				G_STRINGIFY(_cond));                           \
 		}                                                              \
 	} while (0)
 
@@ -61,7 +64,7 @@ extern void bt_common_assert_failed(const char *file, int line,
  * In-depth explanation: https://stackoverflow.com/questions/37411809/how-to-elegantly-fix-this-unused-variable-warning/37412551#37412551
  */
 # define BT_ASSERT(_cond)	((void) sizeof((void) (_cond), 0))
-# define BT_ASSERT_FUNC		BT_UNUSED
+# define BT_ASSERT_FUNC		__attribute__((unused))
 #endif /* BT_DEBUG_MODE */
 
 #endif /* BABELTRACE_ASSERT_INTERNAL_H */