summaryrefslogtreecommitdiff
path: root/coreutils/od_bloaty.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2016-05-16 09:33:03 +0100
committerRon Yorston <rmy@pobox.com>2016-05-16 09:33:03 +0100
commit35d2f5bccb0f3dde600702ebcdb5424d4d50be4a (patch)
tree6e0ff0341c69839e268459a199682628bae734ed /coreutils/od_bloaty.c
parent248a2600a2f4b442101ad568d1994b908bb28d4b (diff)
parentf2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af (diff)
downloadbusybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.gz
busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.bz2
busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/od_bloaty.c')
-rw-r--r--coreutils/od_bloaty.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 3e0423a3d..a5b3e99f7 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -20,6 +20,7 @@
20 20
21 21
22/* #include "libbb.h" - done in od.c */ 22/* #include "libbb.h" - done in od.c */
23#include "common_bufsiz.h"
23#define assert(a) ((void)0) 24#define assert(a) ((void)0)
24 25
25 26
@@ -221,8 +222,9 @@ struct globals {
221#if !ENABLE_LONG_OPTS 222#if !ENABLE_LONG_OPTS
222enum { G_pseudo_offset = 0 }; 223enum { G_pseudo_offset = 0 };
223#endif 224#endif
224#define G (*(struct globals*)&bb_common_bufsiz1) 225#define G (*(struct globals*)bb_common_bufsiz1)
225#define INIT_G() do { \ 226#define INIT_G() do { \
227 setup_common_bufsiz(); \
226 BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ 228 BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
227 G.bytes_per_block = 32; \ 229 G.bytes_per_block = 32; \
228} while (0) 230} while (0)