summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@freebsd.home.tridgell.net>2010-03-24 05:06:25 +1100
committerStefan Metzmacher <metze@samba.org>2010-03-24 07:11:38 +0100
commita599319d0a389ff0c31dae8068cd7a78352aa9e7 (patch)
tree07f9ae9c8c5d121261f5e17cce8638c1f5029d70
parent83aaf4829e2b9bece5c1b4181553d3025d6d2cb3 (diff)
downloadsamba-a599319d0a389ff0c31dae8068cd7a78352aa9e7.tar.gz
samba-a599319d0a389ff0c31dae8068cd7a78352aa9e7.tar.bz2
samba-a599319d0a389ff0c31dae8068cd7a78352aa9e7.zip
libreplace: fixed declaration of dprintf() on FreeBSD
-rw-r--r--lib/replace/replace.c4
-rw-r--r--lib/replace/replace.h10
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index f2dcb10ddc..e4b97a8913 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -705,7 +705,7 @@ void *rep_memmem(const void *haystack, size_t haystacklen,
#endif
#ifndef HAVE_VDPRINTF
-int vdprintf(int fd, const char *format, va_list ap)
+int rep_vdprintf(int fd, const char *format, va_list ap)
{
char *s = NULL;
int ret;
@@ -722,7 +722,7 @@ int vdprintf(int fd, const char *format, va_list ap)
#endif
#ifndef HAVE_DPRINTF
-int dprintf(int fd, const char *format, ...)
+int rep_dprintf(int fd, const char *format, ...)
{
int ret;
va_list ap;
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index e7578cd60f..cd73e65bea 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -336,6 +336,16 @@ int rep_dlclose(void *handle);
/* prototype is in system/network.h */
#endif
+#ifndef HAVE_VDPRINTF
+#define vdprintf rep_vdprintf
+int rep_vdprintf(int fd, const char *format, va_list ap);
+#endif
+
+#ifndef HAVE_DPRINTF
+#define dprintf rep_dprintf
+int rep_dprintf(int fd, const char *format, ...);
+#endif
+
#ifndef PRINTF_ATTRIBUTE
#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
/** Use gcc attribute to check printf fns. a1 is the 1-based index of