X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/290e19f26b10dc49485d7d7b06859edff32fd1e1..6e8589d6a8476d3d6dd2453d933ed9759cd215b0:/src/xbt/dict.c diff --git a/src/xbt/dict.c b/src/xbt/dict.c index d59086b851..8208fe5194 100644 --- a/src/xbt/dict.c +++ b/src/xbt/dict.c @@ -1,6 +1,6 @@ /* dict - a generic dictionary, variation over hash table */ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,7 +11,7 @@ #include "xbt/ex.h" #include "xbt/log.h" #include "xbt/mallocator.h" -#include "xbt_modinter.h" +#include "src/xbt_modinter.h" #include "xbt/str.h" #include "dict_private.h" @@ -676,7 +676,9 @@ void xbt_dict_postexit(void) #ifdef SIMGRID_TEST #include "xbt.h" #include "xbt/ex.h" -#include "portable.h" +#include "src/portable.h" + +#define PRINTF_STR(a) (a)?:"(null)" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict); @@ -822,7 +824,7 @@ static void count_check_get_key(xbt_dict_t dict, int length) { xbt_dict_cursor_t cursor; char *key; - _XBT_GNUC_UNUSED char *key2; + XBT_ATTRIB_UNUSED char *key2; void *data; int effective = 0;