wok-6.x rev 19611
busybox: replace 1.25 stuff by 1.26 (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Jan 08 16:36:32 2017 +0100 (2017-01-08) |
parents | e899d0ad6fde |
children | fa3033fa9507 |
files | busybox/stuff/busybox-1.23-fbvnc.u busybox/stuff/busybox-1.23-losetup.u busybox/stuff/busybox-1.26-fbvnc.u busybox/stuff/busybox-1.26-losetup.u |
line diff
1.1 --- a/busybox/stuff/busybox-1.23-fbvnc.u Sun Jan 08 14:40:47 2017 +0100 1.2 +++ b/busybox/stuff/busybox-1.23-fbvnc.u Sun Jan 08 16:36:32 2017 +0100 1.3 @@ -418,7 +418,7 @@ 1.4 + G.mc += ie[1]; 1.5 + G.mr -= ie[2]; 1.6 + refresh = 2 - update_scroll(&G.scroll[0]) - update_scroll(&G.scroll[1]); 1.7 -+ me.mask = btn2vnc[G.rat_buttons = ie[0] & 7]; 1.8 ++ me.mask = btn2vnc[(int)(G.rat_buttons = ie[0] & 7)]; 1.9 + if (ie[3] > 0) /* wheel up */ 1.10 + me.mask |= VNC_BUTTON4_MASK; 1.11 + if (ie[3] < 0) /* wheel down */
2.1 --- a/busybox/stuff/busybox-1.23-losetup.u Sun Jan 08 14:40:47 2017 +0100 2.2 +++ b/busybox/stuff/busybox-1.23-losetup.u Sun Jan 08 16:36:32 2017 +0100 2.3 @@ -8,7 +8,7 @@ 2.4 + if (opt == OPT_a || (!opt && !argv[0])) { 2.5 - int n; 2.6 + int i, n; 2.7 -+ static char *fmt[3] = { LOOP_FORMAT, "/dev/cloop", "/dev/cloop%u" }; 2.8 ++ static const char *fmt[3] = { LOOP_FORMAT, "/dev/cloop", "/dev/cloop%u" }; 2.9 + 2.10 + for (i = 0; i < 3; i++) 2.11 for (n = 0; n < MAX_LOOP_NUM; n++) {
3.1 --- a/busybox/stuff/busybox-1.26-fbvnc.u Sun Jan 08 14:40:47 2017 +0100 3.2 +++ b/busybox/stuff/busybox-1.26-fbvnc.u Sun Jan 08 16:36:32 2017 +0100 3.3 @@ -419,7 +419,7 @@ 3.4 + G.mc += ie[1]; 3.5 + G.mr -= ie[2]; 3.6 + refresh = 2 - update_scroll(&G.scroll[0]) - update_scroll(&G.scroll[1]); 3.7 -+ me.mask = btn2vnc[G.rat_buttons = ie[0] & 7]; 3.8 ++ me.mask = btn2vnc[(int)(G.rat_buttons = ie[0] & 7)]; 3.9 + if (ie[3] > 0) /* wheel up */ 3.10 + me.mask |= VNC_BUTTON4_MASK; 3.11 + if (ie[3] < 0) /* wheel down */
4.1 --- a/busybox/stuff/busybox-1.26-losetup.u Sun Jan 08 14:40:47 2017 +0100 4.2 +++ b/busybox/stuff/busybox-1.26-losetup.u Sun Jan 08 16:36:32 2017 +0100 4.3 @@ -9,7 +9,7 @@ 4.4 - int n; 4.5 + if (opt == OPT_a || (!opt && !argv[0])) { 4.6 + int i, n; 4.7 -+ static char *fmt[3] = { LOOP_FORMAT, "/dev/cloop", "/dev/cloop%u" }; 4.8 ++ static const char *fmt[3] = { LOOP_FORMAT, "/dev/cloop", "/dev/cloop%u" }; 4.9 + 4.10 + for (i = 0; i < 3; i++) 4.11 for (n = 0; n < MAX_LOOP_NUM; n++) {