[git commit] libbb/loop: fix compile failure (name collision)

Denys Vlasenko vda.linux at googlemail.com
Mon Jan 2 16:03:44 UTC 2023


commit: https://git.busybox.net/busybox/commit/?id=e7977df2cae2ac2c5da38f77488ec9e97d10c33b
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/loop.c | 4 ++--
 1 file 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)
 
 #if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_LOOP_CONFIGURE
 # define LOOP_CONFIGURE 0x4C0A
-struct loop_config {
+struct bb_loop_config {
 	uint32_t fd;
 	uint32_t block_size;
 	struct loop_info64 info;
@@ -128,7 +128,7 @@ static int set_loopdev_params(int lfd,
 {
 	int rc;
 #if ENABLE_TRY_LOOP_CONFIGURE || ENABLE_LOOP_CONFIGURE
-	struct loop_config lconfig;
+	struct bb_loop_config lconfig;
 # define loopinfo lconfig.info
 #else
 	bb_loop_info loopinfo;


More information about the busybox-cvs mailing list