From 57542ebe4fee39b6d3091b964c42ce07ecfec7ef Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 28 Nov 2010 03:59:30 +0100 Subject: hush: move G_x_mode define to the more appropriate place Signed-off-by: Denys Vlasenko --- shell/hush.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'shell') 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 { # define G_saved_tty_pgrp 0 #endif char o_opt[NUM_OPT_O]; +#if ENABLE_HUSH_MODE_X +# define G_x_mode (G.o_opt[OPT_O_XTRACE]) +#else +# define G_x_mode 0 +#endif smallint flag_SIGINT; #if ENABLE_HUSH_LOOPS smallint flag_break_continue; @@ -743,11 +748,6 @@ struct globals { * 1: return is invoked, skip all till end of func */ smallint flag_return_in_progress; -#endif -#if ENABLE_HUSH_MODE_X -# define G_x_mode (G.o_opt[OPT_O_XTRACE]) -#else -# define G_x_mode 0 #endif smallint exiting; /* used to prevent EXIT trap recursion */ /* These four support $?, $#, and $1 */ -- cgit v1.2.3