remove useless includes

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

diff --git a/include/xbt/lib.h b/include/xbt/lib.h
index e42c14a..56a9007 100644 (file)
--- a/include/xbt/lib.h
+++ b/include/xbt/lib.h
@@ -6,8 +6,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_LIB_H
-#define _XBT_LIB_H
+#ifndef XBT_LIB_H
+#define XBT_LIB_H
 
 #include <xbt/dict.h>
 
@@ -21,9 +21,8 @@ SG_BEGIN_DECL()
  *
  *  * the element itself is represented aby the xbt_dictelm_t;
  *
- *  * the element can store any number of associated facets/data structures
- *    (corresponding to the different layers of SimGrid or its extensions)
- *    in ((void**)dictelt->content)[level];
+ *  * the element can store any number of associated facets/data structures (corresponding to the different layers of
+ *    SimGrid or its extensions) in ((void**)dictelt->content)[level];
  *
  *  * each level is allocated in the lib with `xbt_lib_add_level`.
  *
@@ -49,22 +48,22 @@ SG_BEGIN_DECL()
  *  xbt_lib_set(foo_lib, id, AUTH_FOO_LEVEL, auth);
  *  </pre>
  */
-typedef struct s_xbt_lib {
+struct s_xbt_lib {
   xbt_dict_t dict;
   int levels;
   void_f_pvoid_t *free_f;       /* This is actually a table */
-} s_xbt_lib_t, *xbt_lib_t;
+};
+typedef struct s_xbt_lib  s_xbt_lib_t;
+typedef struct s_xbt_lib* xbt_lib_t;
 
 #define xbt_lib_cursor_t xbt_dict_cursor_t
 
 XBT_PUBLIC(xbt_lib_t) xbt_lib_new(void);
 XBT_PUBLIC(void) xbt_lib_free(xbt_lib_t * lib);
 XBT_PUBLIC(int) xbt_lib_add_level(xbt_lib_t lib, void_f_pvoid_t free_f);
-XBT_PUBLIC(void) xbt_lib_set(xbt_lib_t lib, const char *name, int level,
-                             void *obj);
+XBT_PUBLIC(void) xbt_lib_set(xbt_lib_t lib, const char *name, int level, void *obj);
 XBT_PUBLIC(void) xbt_lib_unset(xbt_lib_t lib, const char *key, int level, int invoke_callback);
-XBT_PUBLIC(void *) xbt_lib_get_or_null(xbt_lib_t lib, const char *name,
-                                       int level);
+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);
 XBT_PUBLIC(void) xbt_lib_remove(xbt_lib_t lib, const char *key);
@@ -77,4 +76,5 @@ XBT_PUBLIC(void) xbt_lib_remove(xbt_lib_t lib, const char *key);
   xbt_dict_foreach((lib)->dict, cursor, key, data)
 
 SG_END_DECL()
+
 #endif                          /* _XBT_LIB_H */