The windows implementation of simgrid use now the portable snprintf so, enable the...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4731 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/win32/compiler/visualc.h b/src/win32/compiler/visualc.h
index 3833296..c7268be 100644 (file)
--- a/src/win32/compiler/visualc.h
+++ b/src/win32/compiler/visualc.h
@@ -164,10 +164,21 @@
        #undef HAVE_SIGNAL
 #endif
 
        #undef HAVE_SIGNAL
 #endif
 

+/* "disable the snprintf replacement ( this function is broken on system v only" */
+
+
+
+#ifndef PREFER_PORTABLE_SNPRINTF
+#  define PREFER_PORTABLE_SNPRINTF     1       
+#endif
+

 /* The compiler has `snprintf' function. */
 /* The compiler has `snprintf' function. */

-#if _MSC_VER >= 7 /* FIXME: check version number */
-#  ifndef HAVE_SNPRINTF
-       #define HAVE_SNPRINTF   1
+#if _MSC_VER >= 1400 
+#  ifdef HAVE_SNPRINTF
+#    undef HAVE_SNPRINTF       1
+#    ifndef PREFER_PORTABLE_SNPRINTF
+#      define snprintf _snprintf
+#    endif

 #  endif
 #else 
 #  ifdef HAVE_SNPRINTF
 #  endif
 #else 
 #  ifdef HAVE_SNPRINTF


@@ -207,13 +218,6 @@
        #define NEED_VASPRINTF
 #endif
 
        #define NEED_VASPRINTF
 #endif
 

-/* "disable the snprintf replacement ( this function is broken on system v only" */
-
-
-#if !defined(PREFER_PORTABLE_SNPRINTF)
-       #define PREFER_PORTABLE_SNPRINTF        
-#endif
-

 /* The maximal size of any scalar on this arch */
 #if !defined(SIZEOF_MAX)
        #define SIZEOF_MAX 8
 /* The maximal size of any scalar on this arch */
 #if !defined(SIZEOF_MAX)
        #define SIZEOF_MAX 8