hush: move G_x_mode define to the more appropriate place

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/shell/hush.c b/shell/hush.c
index 0cc587e195b70a71b62b66b3b9e5d64bc86a1b4b..584af9e064b70398bb6471f362fcf48bba71c2ec 100644 (file)
--- 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 */