commit ff463a885d7dbcea5493074cae498d58a5459539
author Denys Vlasenko <vda.linux@googlemail.com> Sun May 12 02:45:23 2013 +0200
committer Denys Vlasenko <vda.linux@googlemail.com> Sun May 12 02:45:23 2013 +0200
tree 7abc5948b963d9edb10ca73b84116204585b6139
parent abbc478f1c5ca76cc382d033a06c91af046f8791

hush: fix build failure if FEATURE_EDITING=y && !HUSH_INTERACTIVE

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

shell/hush.c

diff --git a/shell/hush.c b/shell/hush.c
index 7cebe17..1a2603e 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -850,7 +850,7 @@
 #if ENABLE_HUSH_HELP
 static int builtin_help(char **argv) FAST_FUNC;
 #endif
-#if MAX_HISTORY
+#if MAX_HISTORY && ENABLE_FEATURE_EDITING
 static int builtin_history(char **argv) FAST_FUNC;
 #endif
 #if ENABLE_HUSH_LOCAL
@@ -922,7 +922,7 @@
 #if ENABLE_HUSH_HELP
 	BLTIN("help"     , builtin_help    , NULL),
 #endif
-#if MAX_HISTORY
+#if MAX_HISTORY && ENABLE_FEATURE_EDITING
 	BLTIN("history"  , builtin_history , "Show command history"),
 #endif
 #if ENABLE_HUSH_JOB
@@ -8633,7 +8633,7 @@
 }
 #endif
 
-#if MAX_HISTORY
+#if MAX_HISTORY && ENABLE_FEATURE_EDITING
 static int FAST_FUNC builtin_history(char **argv UNUSED_PARAM)
 {
 	show_history(G.line_input_state);