Include surf_resource.h, for surf_resource_name().

[simgrid.git] / src / xbt / dict_private.h

diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index 0096394..033500f 100644 (file)
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -17,11 +17,11 @@
 #include "xbt/dict.h"
 #include "xbt/mallocator.h"
 
-typedef struct xbt_dictelm_ *xbt_dictelm_t;
+typedef struct s_xbt_dictelm *xbt_dictelm_t;
 
 #define MAX_FILL_PERCENT 80
 
-typedef struct xbt_dictelm_ {
+typedef struct s_xbt_dictelm {
   int dictielem:1;
   char *key;
   int key_len;
@@ -33,26 +33,26 @@ typedef struct xbt_dictelm_ {
   xbt_dictelm_t next;
 } s_xbt_dictelm_t;
 
-typedef struct xbt_dict_ {
+typedef struct s_xbt_dict {
   xbt_dictelm_t *table;
   int table_size;
   int count;
   int fill;
 } s_xbt_dict_t;
 
-typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t;
+typedef struct s_xbt_dict_cursor s_xbt_dict_cursor_t;
 
 extern xbt_mallocator_t dict_elm_mallocator;
 extern void *dict_elm_mallocator_new_f(void);
-extern void dict_elm_mallocator_free_f(void *elem);
-extern void dict_elm_mallocator_reset_f(void *elem);
+#define dict_elm_mallocator_free_f xbt_free_f
+#define dict_elm_mallocator_reset_f ((void_f_pvoid_t)NULL)
 
 /*####[ Function prototypes ]################################################*/
 xbt_dictelm_t xbt_dictelm_new(const char *key, int key_len,
                               unsigned int hash_code, void *content,
                               void_f_pvoid_t free_f);
-xbt_dictelm_t xbt_dictielm_new(uintptr_t key, unsigned int hash_code, uintptr_t content);
+xbt_dictelm_t xbt_dictielm_new(uintptr_t key, unsigned int hash_code,
+                               uintptr_t content);
 void xbt_dictelm_free(xbt_dictelm_t element);
-void xbt_dict_add_element(xbt_dict_t dict, xbt_dictelm_t element);
 
-#endif /* _XBT_DICT_PRIVATE_H_ */
+#endif                          /* _XBT_DICT_PRIVATE_H_ */