# HG changeset patch # User Pascal Bellard # Date 1483889792 -3600 # Node ID 5a847ebc42a952017ef2929a66329ae858621626 # Parent e899d0ad6fdeb35eae210f0dd7b7597ff37ac4c9 busybox: replace 1.25 stuff by 1.26 (again) diff -r e899d0ad6fde -r 5a847ebc42a9 busybox/stuff/busybox-1.23-fbvnc.u --- a/busybox/stuff/busybox-1.23-fbvnc.u Sun Jan 08 14:40:47 2017 +0100 +++ b/busybox/stuff/busybox-1.23-fbvnc.u Sun Jan 08 16:36:32 2017 +0100 @@ -418,7 +418,7 @@ + G.mc += ie[1]; + G.mr -= ie[2]; + refresh = 2 - update_scroll(&G.scroll[0]) - update_scroll(&G.scroll[1]); -+ me.mask = btn2vnc[G.rat_buttons = ie[0] & 7]; ++ me.mask = btn2vnc[(int)(G.rat_buttons = ie[0] & 7)]; + if (ie[3] > 0) /* wheel up */ + me.mask |= VNC_BUTTON4_MASK; + if (ie[3] < 0) /* wheel down */ diff -r e899d0ad6fde -r 5a847ebc42a9 busybox/stuff/busybox-1.23-losetup.u --- a/busybox/stuff/busybox-1.23-losetup.u Sun Jan 08 14:40:47 2017 +0100 +++ b/busybox/stuff/busybox-1.23-losetup.u Sun Jan 08 16:36:32 2017 +0100 @@ -8,7 +8,7 @@ + if (opt == OPT_a || (!opt && !argv[0])) { - int n; + int i, n; -+ static char *fmt[3] = { LOOP_FORMAT, "/dev/cloop", "/dev/cloop%u" }; ++ static const char *fmt[3] = { LOOP_FORMAT, "/dev/cloop", "/dev/cloop%u" }; + + for (i = 0; i < 3; i++) for (n = 0; n < MAX_LOOP_NUM; n++) { diff -r e899d0ad6fde -r 5a847ebc42a9 busybox/stuff/busybox-1.26-fbvnc.u --- a/busybox/stuff/busybox-1.26-fbvnc.u Sun Jan 08 14:40:47 2017 +0100 +++ b/busybox/stuff/busybox-1.26-fbvnc.u Sun Jan 08 16:36:32 2017 +0100 @@ -419,7 +419,7 @@ + G.mc += ie[1]; + G.mr -= ie[2]; + refresh = 2 - update_scroll(&G.scroll[0]) - update_scroll(&G.scroll[1]); -+ me.mask = btn2vnc[G.rat_buttons = ie[0] & 7]; ++ me.mask = btn2vnc[(int)(G.rat_buttons = ie[0] & 7)]; + if (ie[3] > 0) /* wheel up */ + me.mask |= VNC_BUTTON4_MASK; + if (ie[3] < 0) /* wheel down */ diff -r e899d0ad6fde -r 5a847ebc42a9 busybox/stuff/busybox-1.26-losetup.u --- a/busybox/stuff/busybox-1.26-losetup.u Sun Jan 08 14:40:47 2017 +0100 +++ b/busybox/stuff/busybox-1.26-losetup.u Sun Jan 08 16:36:32 2017 +0100 @@ -9,7 +9,7 @@ - int n; + if (opt == OPT_a || (!opt && !argv[0])) { + int i, n; -+ static char *fmt[3] = { LOOP_FORMAT, "/dev/cloop", "/dev/cloop%u" }; ++ static const char *fmt[3] = { LOOP_FORMAT, "/dev/cloop", "/dev/cloop%u" }; + + for (i = 0; i < 3; i++) for (n = 0; n < MAX_LOOP_NUM; n++) {