summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-10-24 23:52:29 +0000
committerJeremy Allison <jra@samba.org>2001-10-24 23:52:29 +0000
commitd0015fae10bf1c65aa7abd1a9551eb2c268fdb8f (patch)
tree6e8be3969a7c0ce264a8cacae6d87a2cfdc58736 /source3/lib
parent11d830c53388c14841eea6c12859d1e3346c1cf2 (diff)
downloadsamba-d0015fae10bf1c65aa7abd1a9551eb2c268fdb8f.tar.gz
samba-d0015fae10bf1c65aa7abd1a9551eb2c268fdb8f.tar.bz2
samba-d0015fae10bf1c65aa7abd1a9551eb2c268fdb8f.zip
Added || -> && fix from "Orwig, Paul" <PORWIG@PacificLife.com>.
Jeremy. (This used to be commit 57b8e6d742addd9fa90da918ec4343d47562f0b7)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/snprintf.c4
1 files changed, 2 insertions, 2 deletions
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;