Fix merge conflicts, and because this still has a zillion warnings,

protect the build with a WARNS=2.

Fix the build.

1 files changed, 0 insertions, 9 deletions

diff --git a/usr.bin/tip/libacu/tod.h b/usr.bin/tip/libacu/tod.h
deleted file mode 100644
index d772230..0000000
--- a/usr.bin/tip/libacu/tod.h
+++ /dev/null
@@ -1,9 +0,0 @@
-int tod_cmp (const struct timeval *a, const struct timeval *b);
-int tod_lt (const struct timeval *a, const struct timeval *b) ;
-int tod_gt (const struct timeval *a, const struct timeval *b);
-int tod_lte (const struct timeval *a, const struct timeval *b);
-int tod_gte (const struct timeval *a, const struct timeval *b);
-int tod_eq (const struct timeval *a, const struct timeval *b);
-void tod_addto (struct timeval *a, const struct timeval *b);
-void tod_subfrom (struct timeval *a, struct timeval b);
-void tod_gettime (struct timeval *tp);