[git commit master 1/1] hush: move G_x_mode define to the more appropriate place
Denys Vlasenko
vda.linux at googlemail.com
Sun Nov 28 02:59:30 UTC 2010
commit: http://git.busybox.net/busybox/commit/?id=57542ebe4fee39b6d3091b964c42ce07ecfec7ef
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
shell/hush.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/shell/hush.c b/shell/hush.c
index 0cc587e..584af9e 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;
@@ -744,11 +749,6 @@ struct globals {
*/
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 */
smalluint last_exitcode;
--
1.7.2.2
More information about the busybox-cvs
mailing list