diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2023-01-02 17:03:26 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2023-01-02 17:03:44 +0100 |
commit | e7977df2cae2ac2c5da38f77488ec9e97d10c33b (patch) | |
tree | f735d1ac87f55b84e191bf07f3408779af5cb8bf | |
parent | fb0c000567634db32a644fef0e82627517a0f2e8 (diff) | |
download | busybox-w32-e7977df2cae2ac2c5da38f77488ec9e97d10c33b.tar.gz busybox-w32-e7977df2cae2ac2c5da38f77488ec9e97d10c33b.tar.bz2 busybox-w32-e7977df2cae2ac2c5da38f77488ec9e97d10c33b.zip |
libbb/loop: fix compile failure (name collision)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | libbb/loop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/loop.c b/libbb/loop.c index 95c4a34e2..a0c5d0259 100644 --- a/libbb/loop.c +++ b/libbb/loop.c | |||
@@ -112,7 +112,7 @@ static int get_next_free_loop(char *dev, int id) | |||
112 | 112 | ||
113 | #if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_LOOP_CONFIGURE | 113 | #if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_LOOP_CONFIGURE |
114 | # define LOOP_CONFIGURE 0x4C0A | 114 | # define LOOP_CONFIGURE 0x4C0A |
115 | struct loop_config { | 115 | struct bb_loop_config { |
116 | uint32_t fd; | 116 | uint32_t fd; |
117 | uint32_t block_size; | 117 | uint32_t block_size; |
118 | struct loop_info64 info; | 118 | struct loop_info64 info; |
@@ -128,7 +128,7 @@ static int set_loopdev_params(int lfd, | |||
128 | { | 128 | { |
129 | int rc; | 129 | int rc; |
130 | #if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_LOOP_CONFIGURE | 130 | #if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_LOOP_CONFIGURE |
131 | struct loop_config lconfig; | 131 | struct bb_loop_config lconfig; |
132 | # define loopinfo lconfig.info | 132 | # define loopinfo lconfig.info |
133 | #else | 133 | #else |
134 | bb_loop_info loopinfo; | 134 | bb_loop_info loopinfo; |