X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fvalue-const.h;h=67c05795cf126cca9f60554f744c37b46afb9c71;hb=056deb59eb33e87c06c0067907768ab08aff74a2;hp=536b6443f3388bc9ce33533f013ac319a85b75de;hpb=924dc299c8a893e92fcd985fa05c245b591ef314;p=babeltrace.git

diff --git a/include/babeltrace2/value-const.h b/include/babeltrace2/value-const.h
index 536b6443..67c05795 100644
--- a/include/babeltrace2/value-const.h
+++ b/include/babeltrace2/value-const.h
@@ -2,7 +2,7 @@
 #define BABELTRACE2_VALUE_CONST_H
 
 /*
- * Copyright (c) 2015-2018 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,15 @@
  * SOFTWARE.
  */
 
+#ifndef __BT_IN_BABELTRACE_H
+# error "Please include <babeltrace2/babeltrace.h> instead."
+#endif
+
 #include <stdint.h>
 #include <stddef.h>
 
-/* For bt_bool, bt_value */
 #include <babeltrace2/types.h>
 
-/* For __BT_FUNC_STATUS_* */
-#define __BT_FUNC_STATUS_ENABLE
-#include <babeltrace2/func-status.h>
-#undef __BT_FUNC_STATUS_ENABLE
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -127,9 +125,9 @@ extern bt_bool bt_value_compare(const bt_value *object_a,
 
 extern bt_bool bt_value_bool_get(const bt_value *bool_obj);
 
-extern uint64_t bt_value_unsigned_integer_get(const bt_value *integer_obj);
+extern uint64_t bt_value_integer_unsigned_get(const bt_value *integer_obj);
 
-extern int64_t bt_value_signed_integer_get(const bt_value *integer_obj);
+extern int64_t bt_value_integer_signed_get(const bt_value *integer_obj);
 
 extern double bt_value_real_get(const bt_value *real_obj);
 
@@ -163,7 +161,7 @@ typedef bt_bool (* bt_value_map_foreach_entry_const_func)(const char *key,
 typedef enum bt_value_map_foreach_entry_const_status {
 	BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_MEMORY_ERROR	= __BT_FUNC_STATUS_MEMORY_ERROR,
 	BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_OK		= __BT_FUNC_STATUS_OK,
-	BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_CANCELED	= __BT_FUNC_STATUS_CANCELED,
+	BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_INTERRUPTED	= __BT_FUNC_STATUS_INTERRUPTED,
 } bt_value_map_foreach_entry_const_status;
 
 extern bt_value_map_foreach_entry_const_status bt_value_map_foreach_entry_const(
@@ -204,6 +202,4 @@ extern void bt_value_put_ref(const bt_value *value);
 }
 #endif
 
-#include <babeltrace2/undef-func-status.h>
-
 #endif /* BABELTRACE2_VALUE_CONST_H */