lib: rename "self comp. input port message iter." -> "message iterator"

[babeltrace.git] / include / babeltrace2 / logging.h

diff --git a/include/babeltrace2/logging.h b/include/babeltrace2/logging.h
index ea6eadab6fe95a973cf8d2dd67794907037684e2..8091ec436a2bc512f5eada01cb26c77a7ef7e905 100644 (file)
--- a/include/babeltrace2/logging.h
+++ b/include/babeltrace2/logging.h
@@ -2,7 +2,7 @@
 #define BABELTRACE2_LOGGING_H
 
 /*
- * Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
+ * Copyright (c) 2010-2019 EfficiOS Inc. and Linux Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,9 +27,7 @@
 # error "Please include <babeltrace2/babeltrace.h> instead."
 #endif
 
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
+#include <babeltrace2/logging-defs.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -66,19 +64,19 @@ current global log level and the minimal log level are not executed.
 */
 typedef enum bt_logging_level {
        /// Additional, low-level debugging context information.
-       BT_LOGGING_LEVEL_TRACE          = 1,
+       BT_LOGGING_LEVEL_TRACE          = __BT_LOGGING_LEVEL_TRACE,
 
        /**
        Debugging information, only useful when searching for the
        cause of a bug.
        */
-       BT_LOGGING_LEVEL_DEBUG          = 2,
+       BT_LOGGING_LEVEL_DEBUG          = __BT_LOGGING_LEVEL_DEBUG,
 
        /**
        Non-debugging information and failure to load optional
        subsystems.
        */
-       BT_LOGGING_LEVEL_INFO           = 3,
+       BT_LOGGING_LEVEL_INFO           = __BT_LOGGING_LEVEL_INFO,
 
        /**
        Errors caused by a bad usage of the library, that is, a
@@ -87,23 +85,23 @@ typedef enum bt_logging_level {
        The library's and object's states remain consistent when a
        warning is issued.
        */
-       BT_LOGGING_LEVEL_WARNING                = 4,
+       BT_LOGGING_LEVEL_WARNING        = __BT_LOGGING_LEVEL_WARNING,
 
        /**
        An important error from which the library cannot recover, but
        the executed stack of functions can still return cleanly.
        */
-       BT_LOGGING_LEVEL_ERROR          = 5,
+       BT_LOGGING_LEVEL_ERROR          = __BT_LOGGING_LEVEL_ERROR,
 
        /**
        The library cannot continue to work in this condition: it must
        terminate immediately, without even returning to the user's
        execution.
        */
-       BT_LOGGING_LEVEL_FATAL          = 6,
+       BT_LOGGING_LEVEL_FATAL          = __BT_LOGGING_LEVEL_FATAL,
 
        /// Logging is disabled.
-       BT_LOGGING_LEVEL_NONE           = 0xff,
+       BT_LOGGING_LEVEL_NONE           = __BT_LOGGING_LEVEL_NONE,
 } bt_logging_level;
 
 /**