adding modifications for 1 pass & for adding routes only when platform end tag reached

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

diff --git a/include/xbt/str.h b/include/xbt/str.h
index 61e8f54..d51177b 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -14,11 +14,7 @@
 #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()
 
@@ -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,12 +61,20 @@ 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);
 
 /* */
 XBT_PUBLIC(void) xbt_str_strip_spaces(char *);
 XBT_PUBLIC(char *) xbt_str_diff(char *a, char *b);
 
+/** @brief Classical alias to (char*) 
+ *
+ * This of almost no use, beside cosmetics and the GRAS parsing macro (see \ref GRAS_dd_auto).
+ */
+typedef char *xbt_string_t;
+
 /**@}*/
 
 SG_END_DECL()