diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
| commit | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (patch) | |
| tree | f5ec7ac45234c25794c97f87e9a6daa8a551e57c /procps/fuser.c | |
| parent | 72394258b6509b40e0fa08594ac86215a558dfd8 (diff) | |
| parent | 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (diff) | |
| download | busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.gz busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.bz2 busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.zip | |
Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge
Conflicts:
include/platform.h
libbb/Kbuild.src
libbb/messages.c
Diffstat (limited to 'procps/fuser.c')
| -rw-r--r-- | procps/fuser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/procps/fuser.c b/procps/fuser.c index addf1a7d8..a1b93d77f 100644 --- a/procps/fuser.c +++ b/procps/fuser.c | |||
| @@ -35,7 +35,7 @@ typedef struct pid_list { | |||
| 35 | struct globals { | 35 | struct globals { |
| 36 | pid_list *pid_list_head; | 36 | pid_list *pid_list_head; |
| 37 | inode_list *inode_list_head; | 37 | inode_list *inode_list_head; |
| 38 | }; | 38 | } FIX_ALIASING; |
| 39 | #define G (*(struct globals*)&bb_common_bufsiz1) | 39 | #define G (*(struct globals*)&bb_common_bufsiz1) |
| 40 | #define INIT_G() do { } while (0) | 40 | #define INIT_G() do { } while (0) |
| 41 | 41 | ||