diff options
author | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2016-05-16 09:33:03 +0100 |
commit | 35d2f5bccb0f3dde600702ebcdb5424d4d50be4a (patch) | |
tree | 6e0ff0341c69839e268459a199682628bae734ed /util-linux/more.c | |
parent | 248a2600a2f4b442101ad568d1994b908bb28d4b (diff) | |
parent | f2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af (diff) | |
download | busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.gz busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.bz2 busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux/more.c')
-rw-r--r-- | util-linux/more.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util-linux/more.c b/util-linux/more.c index 29984df8c..4812f1bc5 100644 --- a/util-linux/more.c +++ b/util-linux/more.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <conio.h> | 26 | #include <conio.h> |
27 | #endif | 27 | #endif |
28 | #include "libbb.h" | 28 | #include "libbb.h" |
29 | #include "common_bufsiz.h" | ||
29 | 30 | ||
30 | /* Support for FEATURE_USE_TERMIOS */ | 31 | /* Support for FEATURE_USE_TERMIOS */ |
31 | 32 | ||
@@ -35,10 +36,10 @@ struct globals { | |||
35 | struct termios new_settings; | 36 | struct termios new_settings; |
36 | } FIX_ALIASING; | 37 | } FIX_ALIASING; |
37 | #define G (*(struct globals*)bb_common_bufsiz1) | 38 | #define G (*(struct globals*)bb_common_bufsiz1) |
38 | #define INIT_G() ((void)0) | ||
39 | #define initial_settings (G.initial_settings) | 39 | #define initial_settings (G.initial_settings) |
40 | #define new_settings (G.new_settings ) | 40 | #define new_settings (G.new_settings ) |
41 | #define cin_fileno (G.cin_fileno ) | 41 | #define cin_fileno (G.cin_fileno ) |
42 | #define INIT_G() do { setup_common_bufsiz(); } while (0) | ||
42 | 43 | ||
43 | #define setTermSettings(fd, argp) \ | 44 | #define setTermSettings(fd, argp) \ |
44 | do { \ | 45 | do { \ |