diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2004-06-10 18:45:45 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:55 -0500 |
commit | 9f1c978088321b09dea96c54026ebdfaaf770641 (patch) | |
tree | b7ea768e6c23dba07853fe2063240939c211d37d | |
parent | c0bf8425f4b9ee30ffc878704bde980d8c51ed05 (diff) | |
download | samba-9f1c978088321b09dea96c54026ebdfaaf770641.tar.gz samba-9f1c978088321b09dea96c54026ebdfaaf770641.tar.xz samba-9f1c978088321b09dea96c54026ebdfaaf770641.zip |
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)
-rw-r--r-- | source/include/includes.h | 1 | ||||
-rw-r--r-- | source/lib/snprintf.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index ea8eb1a3043..9efdd2cc3aa 100644 --- a/source/include/includes.h +++ b/source/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/source/lib/snprintf.c b/source/lib/snprintf.c index 5b0cfa1ab33..79de3c0ca5d 100644 --- a/source/lib/snprintf.c +++ b/source/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); } |