lib: force user to include `<babeltrace2/babeltrace.h>`

[babeltrace.git] / src / common / common.h

diff --git a/src/common/common.h b/src/common/common.h
index 0f2736f00642782a3588b7675b94e7c97e136342..0fdad32fcd54cad9a1498fa0b2b06a44c51bb9c7 100644 (file)
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -33,15 +33,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <babeltrace2/trace-ir/event-class-const.h>
-#include <babeltrace2/trace-ir/field-class-const.h>
-#include <babeltrace2/trace-ir/field-path-const.h>
-#include <babeltrace2/logging.h>
-#include <babeltrace2/value.h>
+#include <babeltrace2/babeltrace.h>
 
-#define __BT_FUNC_STATUS_ENABLE
+#define __BT_IN_BABELTRACE_H
 #include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
 
 #include "common/assert.h"
 #include "common/macros.h"
@@ -348,6 +343,13 @@ BT_HIDDEN
 GString *bt_common_fold(const char *str, unsigned int total_length,
                unsigned int indent);
 
+/*
+ * Writes the terminal's width to `*width`, its height to `*height`,
+ * and returns 0 on success, or returns -1 on error.
+ */
+BT_HIDDEN
+int bt_common_get_term_size(unsigned int *width, unsigned int *height);
+
 /*
  * Wraps read() function to handle EINTR and partial reads.
  * On success, it returns `count` received as parameter. On error, it returns a
@@ -577,8 +579,8 @@ const char *bt_common_logging_level_string(
                return "BT_LOGGING_LEVEL_DEBUG";
        case BT_LOGGING_LEVEL_INFO:
                return "BT_LOGGING_LEVEL_INFO";
-       case BT_LOGGING_LEVEL_WARN:
-               return "BT_LOGGING_LEVEL_WARN";
+       case BT_LOGGING_LEVEL_WARNING:
+               return "BT_LOGGING_LEVEL_WARNING";
        case BT_LOGGING_LEVEL_ERROR:
                return "BT_LOGGING_LEVEL_ERROR";
        case BT_LOGGING_LEVEL_FATAL:
@@ -714,6 +716,4 @@ end:
        return ret;
 }
 
-#include <babeltrace2/undef-func-status.h>
-
 #endif /* BABELTRACE_COMMON_INTERNAL_H */