Merging in 2.0.2.

2017-01-09 22:37:50 -05:00
parent a0406ec181
commit 50cf3276e7
118 changed files with 1350 additions and 3158 deletions
--- a/userland/lib/hostcompat/Makefile
+++ b/userland/lib/hostcompat/Makefile
@@ -22,11 +22,6 @@ TOP=../../..
 LIB=hostcompat
 SRCS=err.c ntohll.c time.c hostcompat.c

-# printf
-COMMON=$(TOP)/common/libc
-SRCS+=\
-	$(COMMON)/printf/tprintf.c
-
 HOST_CFLAGS+=$(COMPAT_CFLAGS)

 MKDIRS=$(INSTALLTOP)/hostinclude
--- a/userland/lib/hostcompat/hostcompat.h
+++ b/userland/lib/hostcompat/hostcompat.h
@@ -35,11 +35,6 @@ void hostcompat_init(int argc, char **argv);

 time_t __time(time_t *secs, unsigned long *nsecs);

-/* Automated testing extensions. */
-
-int tprintf(const char *fmt, ...);
-int nprintf(const char *fmt, ...);
-
 #ifdef DECLARE_NTOHLL
 uint64_t ntohll(uint64_t);
 #define htonll(x) (ntohll(x))