aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-11-28 03:59:30 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-11-28 03:59:30 +0100
commit57542ebe4fee39b6d3091b964c42ce07ecfec7ef (patch)
tree66e6c2457f0374a5dc25f7785b2c577152f51655
parent85c62470b75b9256e36d8f488a0701aff94ca512 (diff)
downloadbusybox-w32-57542ebe4fee39b6d3091b964c42ce07ecfec7ef.tar.gz
busybox-w32-57542ebe4fee39b6d3091b964c42ce07ecfec7ef.tar.bz2
busybox-w32-57542ebe4fee39b6d3091b964c42ce07ecfec7ef.zip
hush: move G_x_mode define to the more appropriate place
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/hush.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 0cc587e19..584af9e06 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -733,6 +733,11 @@ struct globals {
733# define G_saved_tty_pgrp 0 733# define G_saved_tty_pgrp 0
734#endif 734#endif
735 char o_opt[NUM_OPT_O]; 735 char o_opt[NUM_OPT_O];
736#if ENABLE_HUSH_MODE_X
737# define G_x_mode (G.o_opt[OPT_O_XTRACE])
738#else
739# define G_x_mode 0
740#endif
736 smallint flag_SIGINT; 741 smallint flag_SIGINT;
737#if ENABLE_HUSH_LOOPS 742#if ENABLE_HUSH_LOOPS
738 smallint flag_break_continue; 743 smallint flag_break_continue;
@@ -744,11 +749,6 @@ struct globals {
744 */ 749 */
745 smallint flag_return_in_progress; 750 smallint flag_return_in_progress;
746#endif 751#endif
747#if ENABLE_HUSH_MODE_X
748# define G_x_mode (G.o_opt[OPT_O_XTRACE])
749#else
750# define G_x_mode 0
751#endif
752 smallint exiting; /* used to prevent EXIT trap recursion */ 752 smallint exiting; /* used to prevent EXIT trap recursion */
753 /* These four support $?, $#, and $1 */ 753 /* These four support $?, $#, and $1 */
754 smalluint last_exitcode; 754 smalluint last_exitcode;