#include <stdarg.h> /* va_* */
#include "xbt/misc.h"
#include "xbt/dynar.h"
-
-/* KILLME: Malek, are you sure you need this? */
-#if defined(_WIN32)
-#include <stdio.h>
-#endif
+#include <stdio.h> /* FILE for getline */
SG_BEGIN_DECL()
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
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);
/* */