X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Ftypes.h;h=5b49f50cbb9f700d79f46328028f2e77a8c593f1;hb=b70d57a123c4e4a208b988539a7eb8fceb2b63a7;hp=6884f175103a17d159a626ff84a0f84c5d57e437;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/include/babeltrace2/types.h b/include/babeltrace2/types.h
index 6884f175..5b49f50c 100644
--- a/include/babeltrace2/types.h
+++ b/include/babeltrace2/types.h
@@ -1,8 +1,8 @@
-#ifndef BABELTRACE_TYPES_H
-#define BABELTRACE_TYPES_H
+#ifndef BABELTRACE2_TYPES_H
+#define BABELTRACE2_TYPES_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
@@ -23,17 +23,12 @@
  * SOFTWARE.
  */
 
-#include <stdint.h>
-
-/* Internal use */
-#ifdef __cplusplus
-# define __BT_UPCAST(_type, _p)		static_cast<_type *>(static_cast<void *>(_p))
-# define __BT_UPCAST_CONST(_type, _p)	static_cast<const _type *>(static_cast<const void *>(_p))
-#else
-# define __BT_UPCAST(_type, _p)		((_type *) (_p))
-# define __BT_UPCAST_CONST(_type, _p)	((const _type *) (_p))
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
 #endif
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -96,19 +91,29 @@ typedef struct bt_component_filter bt_component_filter;
 typedef struct bt_component_sink bt_component_sink;
 typedef struct bt_component_source bt_component_source;
 typedef struct bt_connection bt_connection;
+typedef struct bt_error bt_error;
+typedef struct bt_error_cause bt_error_cause;
 typedef struct bt_event bt_event;
 typedef struct bt_event_class bt_event_class;
 typedef struct bt_event_header_field bt_event_header_field;
 typedef struct bt_field bt_field;
 typedef struct bt_field_class bt_field_class;
 typedef struct bt_field_class_enumeration_mapping bt_field_class_enumeration_mapping;
-typedef struct bt_field_class_signed_enumeration_mapping bt_field_class_signed_enumeration_mapping;
-typedef struct bt_field_class_unsigned_enumeration_mapping bt_field_class_unsigned_enumeration_mapping;
+typedef struct bt_field_class_enumeration_signed_mapping bt_field_class_enumeration_signed_mapping;
+typedef struct bt_field_class_enumeration_unsigned_mapping bt_field_class_enumeration_unsigned_mapping;
 typedef struct bt_field_class_structure_member bt_field_class_structure_member;
 typedef struct bt_field_class_variant_option bt_field_class_variant_option;
+typedef struct bt_field_class_variant_with_selector_signed_option bt_field_class_variant_with_selector_signed_option;
+typedef struct bt_field_class_variant_with_selector_unsigned_option bt_field_class_variant_with_selector_unsigned_option;
 typedef struct bt_field_path bt_field_path;
 typedef struct bt_field_path_item bt_field_path_item;
 typedef struct bt_graph bt_graph;
+typedef struct bt_integer_range_set bt_integer_range_set;
+typedef struct bt_integer_range_set_signed bt_integer_range_set_signed;
+typedef struct bt_integer_range_set_unsigned bt_integer_range_set_unsigned;
+typedef struct bt_integer_range_signed bt_integer_range_signed;
+typedef struct bt_integer_range_unsigned bt_integer_range_unsigned;
+typedef struct bt_interrupter bt_interrupter;
 typedef struct bt_message bt_message;
 typedef struct bt_message_iterator bt_message_iterator;
 typedef struct bt_object bt_object;
@@ -124,6 +129,7 @@ typedef struct bt_port_output bt_port_output;
 typedef struct bt_port_output_message_iterator bt_port_output_message_iterator;
 typedef struct bt_query_executor bt_query_executor;
 typedef struct bt_self_component bt_self_component;
+typedef struct bt_self_component_class bt_self_component_class;
 typedef struct bt_self_component_class_filter bt_self_component_class_filter;
 typedef struct bt_self_component_class_sink bt_self_component_class_sink;
 typedef struct bt_self_component_class_source bt_self_component_class_source;
@@ -154,4 +160,4 @@ typedef const struct bt_message **bt_message_array_const;
 }
 #endif
 
-#endif /* BABELTRACE_TYPES_H */
+#endif /* BABELTRACE2_TYPES_H */