hush: move G_x_mode define to the more appropriate place

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-11-28 03:59:30 +01:00
parent 85c62470b7
commit 57542ebe4f

View File

@ -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 */