From 4de0a434d872a362ac4540728c15bfd966e81b86 Mon Sep 17 00:00:00 2001 From: cherierm Date: Mon, 26 Mar 2007 10:07:44 +0000 Subject: [PATCH 1/1] these functions are already declarated in str.h git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3360 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/portable.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/portable.h b/src/portable.h index a4d4f349c5..5e755819d1 100644 --- a/src/portable.h +++ b/src/portable.h @@ -110,15 +110,15 @@ #include #else # if (defined(_MSC_VER) && defined(DLL_EXPORT)) - __declspec(dllexport) int snprintf(char *, size_t, const char *, /*args*/ ...); - __declspec(dllexport) int vsnprintf(char *, size_t, const char *, va_list); + __declspec(dllexport) int snprintf(char *, size_t, const char *, /*args*/ ...); + __declspec(dllexport) int vsnprintf(char *, size_t, const char *, va_list); # elif (defined(_MSC_VER) && !defined(DLL_EXPORT) && !defined(DLL_STATIC) ) - __declspec(dllimport) int snprintf(char *, size_t, const char *, /*args*/ ...); - __declspec(dllimport) int vsnprintf(char *, size_t, const char *, va_list); -#else -extern int snprintf(char *, size_t, const char *, /*args*/ ...); -extern int vsnprintf(char *, size_t, const char *, va_list); -#endif + __declspec(dllimport) int snprintf(char *, size_t, const char *, /*args*/ ...); + __declspec(dllimport) int vsnprintf(char *, size_t, const char *, va_list); +# else + extern int snprintf(char *, size_t, const char *, /*args*/ ...); + extern int vsnprintf(char *, size_t, const char *, va_list); +# endif #endif @@ -131,8 +131,10 @@ extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list #endif /* prototype of GNU functions */ +#ifndef __BORLANDC__ 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); -- 2.20.1