From 96f92a1afac1599cc5f6128e7e9a43bdab220bc8 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 8 Jan 2014 15:25:20 +0100 Subject: libbb: FreeBSD fix for B baud rate constants not fitting into a short. Signed-off-by: Denys Vlasenko --- libbb/speed_table.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libbb') 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 constants don't fit into a short */ + unsigned speed; +#else unsigned short speed; +#endif unsigned short value; }; -- cgit v1.2.3-55-g6feb From 79df481dc4723cc018731508bc08ce42b3b2eb17 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 10 Jan 2014 14:38:26 +0100 Subject: lineedit: fix trivial build failure Signed-off-by: Denys Vlasenko --- libbb/lineedit.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libbb') diff --git a/libbb/lineedit.c b/libbb/lineedit.c index b168f1b86..85643079b 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -1255,7 +1255,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; } -- cgit v1.2.3-55-g6feb