define max only when not previously defined (win32 defines it); move xbt_abort to...

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

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index f16188b..19cd9cf 100644 (file)
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -1,8 +1,8 @@
 /* $Id$ */
 
-/* xbt/dict.h -- api to a generic dictionary                               */
+/* xbt/dict.h -- api to a generic dictionary                                */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
 
 /* 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. */
@@ -12,10 +12,9 @@
 #define _XBT_DICT_H
 
 #include "xbt/misc.h" /* BEGIN_DECL */
+#include "xbt/error.h"
 
-#ifdef  __cplusplus
-extern "C" 
-#endif
+BEGIN_DECL
 
 /*####[ Type definition ]####################################################*/
 typedef struct xbt_dict_ *xbt_dict_t;
@@ -142,8 +141,6 @@ int          xbt_dict_cursor_get_or_free (xbt_dict_cursor_t *cursor,
        xbt_dict_cursor_get_or_free(&(cursor),&(key),(void**)(&data));\
        xbt_dict_cursor_step(cursor) )
 
-#ifdef  __cplusplus
-}
-#endif
+END_DECL
 
 #endif /* _XBT_DICT_H */