From 6604679679d6c5e526e7b3405a32e28b34bf4fa2 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 23 Jan 2008 13:53:36 +0000 Subject: [PATCH 1/1] Allow gcc cross-compilation targetting windows git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5219 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/xbt/snprintf.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/xbt/snprintf.c b/src/xbt/snprintf.c index 0dbbadbec4..e534d0b279 100644 --- 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 #include #include #include #include -#include "portable.h" /* to get a working stdarg.h */ - #include #include #include "xbt/str.h" @@ -399,11 +399,12 @@ int vasnprintf (char **ptr, size_t str_m, const char *fmt, va_list ap); /* 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 -# if !defined(NEED_SNPRINTF_ONLY) +# define portable_snprintf _snprintf +# define portable_vsnprintf vsnprintf +# else +# define portable_snprintf snprintf # define portable_vsnprintf vsnprintf # endif -# endif #else /* declare our portable routines under names snprintf and vsnprintf */ #define portable_snprintf snprintf -- 2.20.1