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 | f28e4f386393b500abfc468e390acfb808d6854a (patch) | |
| tree | b13ea997eb286c49aa94077aa5f1e1664f06a2ec | |
| parent | e107e9790d96ae78c5d3ec17c28ef3ff6ca42e9a (diff) | |
| download | samba-f28e4f386393b500abfc468e390acfb808d6854a.tar.gz samba-f28e4f386393b500abfc468e390acfb808d6854a.tar.bz2 samba-f28e4f386393b500abfc468e390acfb808d6854a.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)
(This used to be commit 9f1c978088321b09dea96c54026ebdfaaf770641)
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/lib/snprintf.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index ea8eb1a304..9efdd2cc3a 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 5b0cfa1ab3..79de3c0ca5 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); } |