From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 12 May 2013 00:45:23 +0000 (+0200)
Subject: hush: fix build failure if FEATURE_EDITING=y && !HUSH_INTERACTIVE
X-Git-Tag: 1_22_0~198
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ff463a885d7dbcea5493074cae498d58a5459539;p=oweals%2Fbusybox.git

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

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

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;
 #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 @@ static const struct built_in_command bltins1[] = {
 #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 @@ static int FAST_FUNC builtin_help(char **argv UNUSED_PARAM)
 }
 #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);