[git commit] shell: use more compact SHELL_ASH / HUSH config defines. no code changes

[Denys Vlasenko]

commit: https://git.busybox.net/busybox/commit/?id=7c3e96d4b3d419d76f97e17d42a4401ee685b7ec
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 include/libbb.h | 12 ++----------
 shell/hush.c    |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/include/libbb.h b/include/libbb.h
index 2a0b272c6..a48782832 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1502,16 +1502,8 @@ int scripted_main(int argc, char** argv) MAIN_EXTERNALLY_VISIBLE;
 
 /* Applets which are useful from another applets */
 int bb_cat(char** argv) FAST_FUNC;
-int ash_main(int argc, char** argv)
-#if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH
-		MAIN_EXTERNALLY_VISIBLE
-#endif
-;
-int hush_main(int argc, char** argv)
-#if ENABLE_HUSH || ENABLE_SH_IS_HUSH || ENABLE_BASH_IS_HUSH
-		MAIN_EXTERNALLY_VISIBLE
-#endif
-;
+int ash_main(int argc, char** argv) IF_SHELL_ASH(MAIN_EXTERNALLY_VISIBLE);
+int hush_main(int argc, char** argv) IF_SHELL_HUSH(MAIN_EXTERNALLY_VISIBLE);
 /* If shell needs them, they exist even if not enabled as applets */
 int echo_main(int argc, char** argv) IF_ECHO(MAIN_EXTERNALLY_VISIBLE);
 int printf_main(int argc, char **argv) IF_PRINTF(MAIN_EXTERNALLY_VISIBLE);
diff --git a/shell/hush.c b/shell/hush.c
index 7156297cf..38d924a3f 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -373,7 +373,7 @@
 # define F_DUPFD_CLOEXEC F_DUPFD
 #endif
 
-#if ENABLE_FEATURE_SH_EMBEDDED_SCRIPTS && !(ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH)
+#if ENABLE_FEATURE_SH_EMBEDDED_SCRIPTS && !ENABLE_SHELL_ASH
 # include "embedded_scripts.h"
 #else
 # define NUM_SCRIPTS 0