aboutsummaryrefslogtreecommitdiff
path: root/libbb/lineedit.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2014-01-13 09:11:24 +0000
committerRon Yorston <rmy@pobox.com>2014-01-13 09:11:24 +0000
commite6edcba4f2fc20a3e9db75ebe82d7a71094fe17c (patch)
treeaf786c447cae6ca59e195b31fbae442c0b42d198 /libbb/lineedit.c
parent215f730e98215bff8dfacafdaa70e4a11395ad53 (diff)
parent0f592d7fb94c5887528d0ee24020c2225ab71c28 (diff)
downloadbusybox-w32-e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c.tar.gz
busybox-w32-e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c.tar.bz2
busybox-w32-e6edcba4f2fc20a3e9db75ebe82d7a71094fe17c.zip
Merge branch 'busybox' into merge
Conflicts: include/platform.h scripts/basic/fixdep.c
Diffstat (limited to 'libbb/lineedit.c')
-rw-r--r--libbb/lineedit.c2
1 files changed, 2 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)
1267{ 1267{
1268 line_input_t *n = xzalloc(sizeof(*n)); 1268 line_input_t *n = xzalloc(sizeof(*n));
1269 n->flags = flags; 1269 n->flags = flags;
1270#if MAX_HISTORY > 0
1270 n->max_history = MAX_HISTORY; 1271 n->max_history = MAX_HISTORY;
1272#endif
1271 return n; 1273 return n;
1272} 1274}
1273 1275