diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-11-27 05:00:55 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-11-27 05:00:55 +0000 |
| commit | 3dddd416e8897a2b8fa9afeee1f22bb57aeeede8 (patch) | |
| tree | 3e0cc29a8a52a59e0a662d73a745bc2ffab70b40 | |
| parent | 32a811ce762bc9061ac71633cd299160ea955737 (diff) | |
| download | samba-3dddd416e8897a2b8fa9afeee1f22bb57aeeede8.tar.gz samba-3dddd416e8897a2b8fa9afeee1f22bb57aeeede8.tar.bz2 samba-3dddd416e8897a2b8fa9afeee1f22bb57aeeede8.zip | |
reverted incorrect patch
(This used to be commit 96224fe2d40d0ce79d1215bb6f0d17291cace7b9)
| -rw-r--r-- | source3/lib/snprintf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/lib/snprintf.c b/source3/lib/snprintf.c index 0610ed18b3..0511a2bf14 100644 --- a/source3/lib/snprintf.c +++ b/source3/lib/snprintf.c @@ -748,14 +748,16 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) (*currlen)++; } -#if !defined(HAVE_VSNPRINTF) && !defined(HAVE_C99_VSNPRINTF) +/* yes this really must be a ||. Don't muck wiith this (tridge) */ +#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF) int vsnprintf (char *str, size_t count, const char *fmt, va_list args) { return dopr(str, count, fmt, args); } #endif -#if !defined(HAVE_SNPRINTF) && !defined(HAVE_C99_SNPRINTF) +/* yes this really must be a ||. Don't muck wiith this (tridge) */ +#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_SNPRINTF) int snprintf(char *str,size_t count,const char *fmt,...) { size_t ret; |