assert-pre-internal.h: move include at correct line

[babeltrace.git] / include / babeltrace / assert-pre-internal.h

diff --git a/include/babeltrace/assert-pre-internal.h b/include/babeltrace/assert-pre-internal.h
index cc412340f69bb0d119c32b5b319fc3270e7f55ed..38f93a2e959c133503120ab97ca4ae243e514b72 100644 (file)
--- a/include/babeltrace/assert-pre-internal.h
+++ b/include/babeltrace/assert-pre-internal.h
@@ -33,7 +33,7 @@
  * also need to define it before including this header.
  *
  * This is a reminder that in order to use
- * <babeltrace/assert-internal.hpp>, you also need to use logging
+ * <babeltrace/assert-pre-internal.h>, you also need to use logging
  * explicitly.
  */
 #ifndef BABELTRACE_LIB_LOGGING_INTERNAL_H
@@ -41,6 +41,8 @@
 #endif
 
 #include <stdlib.h>
+#include <inttypes.h>
+#include <babeltrace/babeltrace-internal.h>
 
 #ifdef BT_DEV_MODE
 /*
@@ -96,8 +98,8 @@
  */
 # define BT_ASSERT_PRE_MSG     BT_LIB_LOGF
 #else
-# define BT_ASSERT_PRE(_cond, _fmt, ...)
-# define BT_ASSERT_PRE_FUNC    __attribute__((unused))
+# define BT_ASSERT_PRE(_cond, _fmt, ...)       ((void) sizeof((void) (_cond), 0))
+# define BT_ASSERT_PRE_FUNC    BT_UNUSED
 # define BT_ASSERT_PRE_MSG(_fmt, ...)
 #endif /* BT_DEV_MODE */