Merge branch 'busybox' into merge

Conflicts:
	include/platform.h
	scripts/basic/fixdep.c

2 files changed, 7 insertions, 0 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 38d4c598d..4bb1ab783 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1267,7 +1267,9 @@ line_input_t* FAST_FUNC new_line_input_t(int flags)
 {
         line_input_t *n = xzalloc(sizeof(*n));
         n->flags = flags;
+#if MAX_HISTORY > 0
         n->max_history = MAX_HISTORY;
+#endif
         return n;
 }
 
diff --git a/libbb/speed_table.c b/libbb/speed_table.c
index 45159f1f3..174d531b2 100644
--- a/libbb/speed_table.c
+++ b/libbb/speed_table.c
@@ -10,7 +10,12 @@
 #include "libbb.h"
 
 struct speed_map {
+#if defined __FreeBSD__
+        /* On FreeBSD, B<num> constants don't fit into a short */
+        unsigned speed;
+#else
         unsigned short speed;
+#endif
         unsigned short value;
 };