From d0015fae10bf1c65aa7abd1a9551eb2c268fdb8f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 24 Oct 2001 23:52:29 +0000 Subject: Added || -> && fix from "Orwig, Paul" . Jeremy. (This used to be commit 57b8e6d742addd9fa90da918ec4343d47562f0b7) --- source3/lib/snprintf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/lib/snprintf.c b/source3/lib/snprintf.c index 0a52e1762b..0610ed18b3 100644 --- a/source3/lib/snprintf.c +++ b/source3/lib/snprintf.c @@ -748,14 +748,14 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) (*currlen)++; } -#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#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_VSNPRINTF) +#if !defined(HAVE_SNPRINTF) && !defined(HAVE_C99_SNPRINTF) int snprintf(char *str,size_t count,const char *fmt,...) { size_t ret; -- cgit