X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd9eb0dffce1ded356741cf4dd0c9c34f6790205..f281a248565b50fe8c8fd760e70e3f50d4740a3f:/include/xbt/str.h diff --git a/include/xbt/str.h b/include/xbt/str.h index ba0a6168cf..d51177bb50 100644 --- a/include/xbt/str.h +++ b/include/xbt/str.h @@ -14,11 +14,7 @@ #include /* va_* */ #include "xbt/misc.h" #include "xbt/dynar.h" - -/* KILLME: Malek, are you sure you need this? */ -#if defined(_WIN32) -#include -#endif +#include /* FILE for getline */ SG_BEGIN_DECL() @@ -54,7 +50,7 @@ XBT_PUBLIC(int) vasprintf (char **ptr, const char *fmt, va_list ap); XBT_PUBLIC(char*) bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2); /* the gettext function. It gets redefined here only if not yet available */ -#if defined(_WIN32) || !defined(__GNUC__) || defined(DOXYGEN) +#if !defined(__USE_GNU) || defined(DOXYGEN) XBT_PUBLIC(long) getline(char **lineptr, size_t *n, FILE *stream); #endif @@ -65,6 +61,8 @@ XBT_PUBLIC(void) xbt_str_trim(char* s, const char* char_list); XBT_PUBLIC(xbt_dynar_t) xbt_str_split(const char *s, const char *sep); XBT_PUBLIC(xbt_dynar_t) xbt_str_split_quoted(const char *s); +XBT_PUBLIC(xbt_dynar_t) xbt_str_split_str(const char *s, const char *sep); + XBT_PUBLIC(char *) xbt_str_join(xbt_dynar_t dynar, const char *sep); /* */