From f28e4f386393b500abfc468e390acfb808d6854a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 10 Jun 2004 18:45:45 +0000 Subject: [PATCH] r1111: Rename vsnprintf to smb_vsnprintf so we don't get duplicate symbol errors when linking against an app that does have vsnprintf() (bug #478) (This used to be commit 9f1c978088321b09dea96c54026ebdfaaf770641) --- source3/include/includes.h | 1 + source3/lib/snprintf.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source3/include/includes.h b/source3/include/includes.h index ea8eb1a3043..9efdd2cc3aa 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1239,6 +1239,7 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) #define snprintf smb_snprintf +#define vsnprintf smb_vsnprintf #endif void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,3); diff --git a/source3/lib/snprintf.c b/source3/lib/snprintf.c index 5b0cfa1ab33..79de3c0ca5d 100644 --- a/source3/lib/snprintf.c +++ b/source3/lib/snprintf.c @@ -817,7 +817,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) (*currlen)++; } - int vsnprintf (char *str, size_t count, const char *fmt, va_list args) + int smb_vsnprintf (char *str, size_t count, const char *fmt, va_list args) { return dopr(str, count, fmt, args); }