Merge branch 'busybox' into merge

2 files changed, 0 insertions, 22 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 0d7dd2a2c..6749cceda 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -90,7 +90,6 @@ lib-y += time.o
 lib-y += trim.o
 lib-y += u_signal_names.o
 lib-y += uuencode.o
-lib-y += vdprintf.o
 lib-y += verror_msg.o
 lib-y += vfork_daemon_rexec.o
 lib-y += warn_ignoring_args.o
diff --git a/libbb/vdprintf.c b/libbb/vdprintf.c
deleted file mode 100644
index 05426873e..000000000
--- a/libbb/vdprintf.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
-
-#include "libbb.h"
-
-#if defined(__GLIBC__) && __GLIBC__ < 2
-int FAST_FUNC vdprintf(int d, const char *format, va_list ap)
-{
-        char buf[8 * 1024];
-        int len;
-
-        len = vsnprintf(buf, sizeof(buf), format, ap);
-        return write(d, buf, len);
-}
-#endif