tiny conflict resolution

[simgrid.git] / include / xbt / lib.h

diff --git a/include/xbt/lib.h b/include/xbt/lib.h
index ec5db54..cdc9fc7 100644 (file)
--- a/include/xbt/lib.h
+++ b/include/xbt/lib.h
@@ -28,6 +28,8 @@ XBT_PUBLIC(void) xbt_lib_set(xbt_lib_t lib, const char *name, int level,
                              void *obj);
 XBT_PUBLIC(void *) xbt_lib_get_or_null(xbt_lib_t lib, const char *name,
                                        int level);
+XBT_PUBLIC(xbt_dictelm_t) xbt_lib_get_elm_or_null(xbt_lib_t lib, const char *key);
+XBT_PUBLIC(void *) xbt_lib_get_level(xbt_dictelm_t elm, int level);
 
 #define xbt_lib_length(lib) xbt_dict_length((lib)->dict)