lib: decouple variant FC option names from selector FC mapping names

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

diff --git a/src/common/common.h b/src/common/common.h
index ca1b1399a6144e3579ad421fc37e23705b3ccdd1..b7245275832466c196ab464a54c3aa7e6ade6f01 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"
@@ -429,8 +424,12 @@ const char *bt_common_field_class_type_string(enum bt_field_class_type class_typ
                return "BT_FIELD_CLASS_TYPE_STATIC_ARRAY";
        case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
                return "BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY";
-       case BT_FIELD_CLASS_TYPE_VARIANT:
-               return "BT_FIELD_CLASS_TYPE_VARIANT";
+       case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
+               return "BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR";
+       case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
+               return "BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR";
+       case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
+               return "BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR";
        default:
                return "(unknown)";
        }
@@ -721,6 +720,4 @@ end:
        return ret;
 }
 
-#include <babeltrace2/undef-func-status.h>
-
 #endif /* BABELTRACE_COMMON_INTERNAL_H */