Some modifications and some files added.

[simgrid.git] / src / xbt / snprintf.c

diff --git a/src/xbt/snprintf.c b/src/xbt/snprintf.c
index 6196c88..e534d0b 100644 (file)
--- a/src/xbt/snprintf.c
+++ b/src/xbt/snprintf.c
@@ -316,14 +316,14 @@
 #define LINUX_COMPATIBLE
 #endif
 
+#include "portable.h" /* to get a working stdarg.h */
+
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "portable.h" /* to get a working stdarg.h */
-
 #include <assert.h>
 #include <errno.h>
 #include "xbt/str.h"
@@ -398,6 +398,13 @@ int vasnprintf (char **ptr, size_t str_m, const char *fmt, va_list ap);
 #if defined(HAVE_SNPRINTF)
 /* declare our portable snprintf  routine under name portable_snprintf  */
 /* declare our portable vsnprintf routine under name portable_vsnprintf */
+#  if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#    define portable_snprintf  _snprintf
+#    define portable_vsnprintf  vsnprintf
+#  else
+#    define portable_snprintf  snprintf
+#    define portable_vsnprintf vsnprintf
+#  endif
 #else
 /* declare our portable routines under names snprintf and vsnprintf */
 #define portable_snprintf snprintf