X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a645eaba6229b6b7742f16316a4051fa65b7a492..3d845df082d79ab89649c1a8829eea201ae01085:/src/surf/surfxml_parse.c diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index c82a3070ec..e7f1b457ca 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -7,13 +7,11 @@ #include #include #include /* va_arg */ -#ifndef _MSC_VER -#include -#endif #include "xbt/misc.h" #include "xbt/log.h" #include "xbt/str.h" +#include "xbt/file.h" #include "xbt/dict.h" #include "surf/surfxml_parse.h" #include "surf/surf_private.h" @@ -1031,17 +1029,7 @@ void surf_parse_open(const char *file) if (!surf_parsed_filename_stack) surf_parsed_filename_stack = xbt_dynar_new(sizeof(char *), &xbt_free_ref); -#ifdef _MSC_VER - /* There is no dirname on windows... */ - char drive[_MAX_DRIVE]; - char dir[_MAX_DIR]; - errno_t err; - err = _splitpath_s(file, drive, _MAX_DRIVE, dir, _MAX_DIR, NULL,0, NULL,0); - char *dir = bprintf("%s%s",drive,dir); -#else - surf_parsed_filename = xbt_strdup(file); - char *dir = dirname(surf_parsed_filename); -#endif + char *dir = xbt_dirname(file); xbt_dynar_push(surf_path, &dir); surf_file_to_parse = surf_fopen(file, "r");