Visual C++ config doesn't use the gnu functions

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

diff --git a/src/portable.h b/src/portable.h
index 5e75581..a6a0220 100644 (file)
--- a/src/portable.h
+++ b/src/portable.h
@@ -106,7 +106,7 @@
  ****/
 
 /* prototype of C99 functions */
  ****/
 
 /* prototype of C99 functions */

-#ifdef HAVE_SNPRINTF
+#if defined(HAVE_SNPRINTF) && defined(_MSC_VER)

 #include <stdio.h>
 #else
 #  if (defined(_MSC_VER) && defined(DLL_EXPORT))
 #include <stdio.h>
 #else
 #  if (defined(_MSC_VER) && defined(DLL_EXPORT))


@@ -131,10 +131,11 @@ extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list
 #endif
 
 /* prototype of GNU functions  */
 #endif
 
 /* prototype of GNU functions  */

-#ifndef __BORLANDC__
+#if !defined(__BORLANDC__) && !defined(_MSC_VER)

 extern int asprintf  (char **ptr, const char *fmt, /*args*/ ...);
 extern int vasprintf (char **ptr, const char *fmt, va_list ap);
 #endif
 extern int asprintf  (char **ptr, const char *fmt, /*args*/ ...);
 extern int vasprintf (char **ptr, const char *fmt, va_list ap);
 #endif

+

 extern int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...);
 extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap);
 
 extern int asnprintf (char **ptr, size_t str_m, const char *fmt, /*args*/ ...);
 extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap);