diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-01-02 10:25:11 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-01-02 10:25:11 +0000 |
| commit | b8f278ee745778806118f57fb7884d205eba05ad (patch) | |
| tree | fef237f6dd302c59918cf389a60c120e58d3e086 /debianutils | |
| parent | 3fd34651ea72ea1c335d3170f234cb0517fd897f (diff) | |
| parent | 57434022cefde87133b8ad39fb3b79c1274e7684 (diff) | |
| download | busybox-w32-b8f278ee745778806118f57fb7884d205eba05ad.tar.gz busybox-w32-b8f278ee745778806118f57fb7884d205eba05ad.tar.bz2 busybox-w32-b8f278ee745778806118f57fb7884d205eba05ad.zip | |
Merge branch 'busybox' into merge
Conflicts:
archival/Config.src
shell/ash.c
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/run_parts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c index 2c2b032be..527fae227 100644 --- a/debianutils/run_parts.c +++ b/debianutils/run_parts.c | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | struct globals { | 59 | struct globals { |
| 60 | char **names; | 60 | char **names; |
| 61 | int cur; | 61 | int cur; |
| 62 | char *cmd[1]; | 62 | char *cmd[2 /* using 1 provokes compiler warning */]; |
| 63 | } FIX_ALIASING; | 63 | } FIX_ALIASING; |
| 64 | #define G (*(struct globals*)&bb_common_bufsiz1) | 64 | #define G (*(struct globals*)&bb_common_bufsiz1) |
| 65 | #define names (G.names) | 65 | #define names (G.names) |