X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fclock-class.h;h=b39183c2c94db206160cc61b6e022e846aa45700;hb=a1a6f91b16aebef45652d3602e2149de5aec4f72;hp=153456ddb018b800061f7109f3e42bdbd12fc1dd;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git diff --git a/src/lib/trace-ir/clock-class.h b/src/lib/trace-ir/clock-class.h index 153456dd..b39183c2 100644 --- a/src/lib/trace-ir/clock-class.h +++ b/src/lib/trace-ir/clock-class.h @@ -29,7 +29,7 @@ #include "common/macros.h" #include "common/common.h" #include "lib/object-pool.h" -#include "compat/uuid.h" +#include "common/uuid.h" #include #include "lib/property.h" #include "common/assert.h" @@ -62,7 +62,7 @@ struct bt_clock_class { uint64_t offset_cycles; struct { - uint8_t uuid[BABELTRACE_UUID_LEN]; + bt_uuid_t uuid; /* NULL or `uuid` above */ bt_uuid value; @@ -115,7 +115,7 @@ int bt_clock_class_clock_value_from_ns_from_origin( return bt_common_clock_value_from_ns_from_origin(cc->offset_seconds, cc->offset_cycles, cc->frequency, ns_from_origin, - raw_value) ? BT_FUNC_STATUS_OVERFLOW : BT_FUNC_STATUS_OK; + raw_value) ? BT_FUNC_STATUS_OVERFLOW_ERROR : BT_FUNC_STATUS_OK; } #endif /* BABELTRACE_TRACE_IR_CLOCK_CLASS_INTERNAL_H */