[MSVC] use our extended xbt_malloc, but don't choke on 'strdup' that should read...

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

diff --git a/include/xbt/str.h b/include/xbt/str.h
index bd4f575..4741e73 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -1,6 +1,6 @@
 /* str.h - XBT string related functions.                                    */
 
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,7 +9,10 @@
 #ifndef XBT_STR_H
 #define XBT_STR_H
 
+#include <stdint.h> /* ssize_t */
 #include <stdarg.h>             /* va_* */
+#include <stdio.h>  /* FILE */
+#include <stdlib.h> /* size_t, ssize_t */
 #include "xbt/misc.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
@@ -26,8 +29,6 @@ SG_BEGIN_DECL()
  * @{
  */
 /* Our own implementation of getline, mainly useful on the platforms not enjoying this function */
-#include <stdio.h>  /* FILE */
-#include <stdlib.h> /* size_t, ssize_t */
 XBT_PUBLIC(ssize_t) xbt_getline(char **lineptr, size_t * n, FILE * stream);
 
 /* Trim related functions */