.gitignore: add some more IDE / tools related file

[babeltrace.git] / src / lib / assert-cond-base.h

diff --git a/src/lib/assert-cond-base.h b/src/lib/assert-cond-base.h
index 271ed02efd37b959d27cf3ab5981498ab21bd6f1..a2dc3c5b940d163e554ee761ed4ece39e12bbb10 100644 (file)
--- a/src/lib/assert-cond-base.h
+++ b/src/lib/assert-cond-base.h
@@ -5,8 +5,8 @@
  * Copyright (c) 2018-2020 Philippe Proulx <pproulx@efficios.com>
  */
 
  * Copyright (c) 2018-2020 Philippe Proulx <pproulx@efficios.com>
  */
 

-#ifndef BABELTRACE_ASSERT_COND_BASE_INTERNAL_H
-#define BABELTRACE_ASSERT_COND_BASE_INTERNAL_H
+#ifndef BABELTRACE_LIB_ASSERT_COND_BASE_H
+#define BABELTRACE_LIB_ASSERT_COND_BASE_H

 
 /*
  * The macros in this header use macros defined in "lib/logging.h". We
 
 /*
  * The macros in this header use macros defined in "lib/logging.h". We


@@ -24,9 +24,6 @@
 #endif
 
 #include <stdbool.h>
 #endif
 
 #include <stdbool.h>

-#include <stdlib.h>
-#include <inttypes.h>
-#include "common/common.h"

 #include "common/macros.h"
 
 /*
 #include "common/macros.h"
 
 /*


@@ -58,7 +55,7 @@
  */
 #define BT_ASSERT_COND_MSG(_fmt, ...)                                  \
        do {                                                            \
  */
 #define BT_ASSERT_COND_MSG(_fmt, ...)                                  \
        do {                                                            \

-               bt_lib_log(_BT_LOG_SRCLOC_FUNCTION, __FILE__,           \
+               bt_lib_log(__FILE__, __func__,                          \

                        __LINE__, BT_LOG_FATAL, BT_LOG_TAG,             \
                        (_fmt), ##__VA_ARGS__);                         \
        } while (0)
                        __LINE__, BT_LOG_FATAL, BT_LOG_TAG,             \
                        (_fmt), ##__VA_ARGS__);                         \
        } while (0)


@@ -77,7 +74,6 @@
  *
  * 4. Aborts.
  */
  *
  * 4. Aborts.
  */

-BT_HIDDEN

 __attribute__((noreturn))
 void bt_lib_assert_cond_failed(const char *cond_type, const char *func,
                const char *id_suffix, const char *fmt, ...);
 __attribute__((noreturn))
 void bt_lib_assert_cond_failed(const char *cond_type, const char *func,
                const char *id_suffix, const char *fmt, ...);


@@ -169,4 +165,4 @@ void bt_lib_assert_cond_failed(const char *cond_type, const char *func,
  */
 #define BT_ASSERT_COND_SUPPORTED
 
  */
 #define BT_ASSERT_COND_SUPPORTED
 

-#endif /* BABELTRACE_ASSERT_COND_BASE_INTERNAL_H */
+#endif /* BABELTRACE_LIB_ASSERT_COND_BASE_H */