[git commit] hush: fix build failure if FEATURE_EDITING=y && !HUSH_INTERACTIVE
Denys Vlasenko
vda.linux at googlemail.com
Sun May 12 00:45:23 UTC 2013
commit: http://git.busybox.net/busybox/commit/?id=ff463a885d7dbcea5493074cae498d58a5459539
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
shell/hush.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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 @@ 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);
More information about the busybox-cvs
mailing list