summaryrefslogtreecommitdiffstats
path: root/source/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-11-27 05:00:55 +0000
committerAndrew Tridgell <tridge@samba.org>2001-11-27 05:00:55 +0000
commit96224fe2d40d0ce79d1215bb6f0d17291cace7b9 (patch)
tree06858bcf57efcfcc987f7bc4158d34af9c444c6a /source/lib
parent8eb4277b12b600cdbf8a5205ebc76d1d9d52f1aa (diff)
downloadsamba-96224fe2d40d0ce79d1215bb6f0d17291cace7b9.tar.gz
samba-96224fe2d40d0ce79d1215bb6f0d17291cace7b9.tar.xz
samba-96224fe2d40d0ce79d1215bb6f0d17291cace7b9.zip
reverted incorrect patch
Diffstat (limited to 'source/lib')
-rw-r--r--source/lib/snprintf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/lib/snprintf.c b/source/lib/snprintf.c
index 0610ed18b3d..0511a2bf146 100644
--- a/source/lib/snprintf.c
+++ b/source/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;