remove useless includes

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

diff --git a/include/xbt/lib.h b/include/xbt/lib.h
index 404ed25..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>
 
@@ -48,11 +48,13 @@ 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
 
@@ -75,15 +77,4 @@ XBT_PUBLIC(void) xbt_lib_remove(xbt_lib_t lib, const char *key);
 
 SG_END_DECL()
 
-#ifdef __cplusplus
-namespace simgrid {
-namespace xbt {
-  inline void destroy(xbt_lib_t l)
-  {
-    xbt_lib_free(&l);
-  }
-}
-}
-#endif
-
 #endif                          /* _XBT_LIB_H */