aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-05-12 02:45:23 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2013-05-12 02:45:23 +0200
commitff463a885d7dbcea5493074cae498d58a5459539 (patch)
tree7abc5948b963d9edb10ca73b84116204585b6139
parentabbc478f1c5ca76cc382d033a06c91af046f8791 (diff)
downloadbusybox-w32-ff463a885d7dbcea5493074cae498d58a5459539.tar.gz
busybox-w32-ff463a885d7dbcea5493074cae498d58a5459539.tar.bz2
busybox-w32-ff463a885d7dbcea5493074cae498d58a5459539.zip
hush: fix build failure if FEATURE_EDITING=y && !HUSH_INTERACTIVE
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/hush.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 7cebe1784..1a2603e3b 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -850,7 +850,7 @@ static int builtin_jobs(char **argv) FAST_FUNC;
850#if ENABLE_HUSH_HELP 850#if ENABLE_HUSH_HELP
851static int builtin_help(char **argv) FAST_FUNC; 851static int builtin_help(char **argv) FAST_FUNC;
852#endif 852#endif
853#if MAX_HISTORY 853#if MAX_HISTORY && ENABLE_FEATURE_EDITING
854static int builtin_history(char **argv) FAST_FUNC; 854static int builtin_history(char **argv) FAST_FUNC;
855#endif 855#endif
856#if ENABLE_HUSH_LOCAL 856#if ENABLE_HUSH_LOCAL
@@ -922,7 +922,7 @@ static const struct built_in_command bltins1[] = {
922#if ENABLE_HUSH_HELP 922#if ENABLE_HUSH_HELP
923 BLTIN("help" , builtin_help , NULL), 923 BLTIN("help" , builtin_help , NULL),
924#endif 924#endif
925#if MAX_HISTORY 925#if MAX_HISTORY && ENABLE_FEATURE_EDITING
926 BLTIN("history" , builtin_history , "Show command history"), 926 BLTIN("history" , builtin_history , "Show command history"),
927#endif 927#endif
928#if ENABLE_HUSH_JOB 928#if ENABLE_HUSH_JOB
@@ -8633,7 +8633,7 @@ static int FAST_FUNC builtin_help(char **argv UNUSED_PARAM)
8633} 8633}
8634#endif 8634#endif
8635 8635
8636#if MAX_HISTORY 8636#if MAX_HISTORY && ENABLE_FEATURE_EDITING
8637static int FAST_FUNC builtin_history(char **argv UNUSED_PARAM) 8637static int FAST_FUNC builtin_history(char **argv UNUSED_PARAM)
8638{ 8638{
8639 show_history(G.line_input_state); 8639 show_history(G.line_input_state);