diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-10-19 12:53:35 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-10-19 12:53:35 +0100 |
| commit | 8afe8ee83a274925340473fa4d0a984bdcbee740 (patch) | |
| tree | b78ed448cb6a55ba7d0ef8141a9f68b55b8acf11 /findutils/grep.c | |
| parent | caab029609633220c417dc0aaa9025fd4b7a169c (diff) | |
| parent | 3d0805e9e7c45e6c0f9fb5e587d8b4a5a5f3c74c (diff) | |
| download | busybox-w32-8afe8ee83a274925340473fa4d0a984bdcbee740.tar.gz busybox-w32-8afe8ee83a274925340473fa4d0a984bdcbee740.tar.bz2 busybox-w32-8afe8ee83a274925340473fa4d0a984bdcbee740.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'findutils/grep.c')
| -rw-r--r-- | findutils/grep.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 0336b2927..e163e6562 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
| @@ -211,9 +211,7 @@ struct globals { | |||
| 211 | } FIX_ALIASING; | 211 | } FIX_ALIASING; |
| 212 | #define G (*(struct globals*)&bb_common_bufsiz1) | 212 | #define G (*(struct globals*)&bb_common_bufsiz1) |
| 213 | #define INIT_G() do { \ | 213 | #define INIT_G() do { \ |
| 214 | struct G_sizecheck { \ | 214 | BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ |
| 215 | char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \ | ||
| 216 | }; \ | ||
| 217 | } while (0) | 215 | } while (0) |
| 218 | #define max_matches (G.max_matches ) | 216 | #define max_matches (G.max_matches ) |
| 219 | #if !ENABLE_EXTRA_COMPAT | 217 | #if !ENABLE_EXTRA_COMPAT |