Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix the 32 bit build (I guess the authors don't have any 32 bit machines 

anymore)
This commit is contained in:
christos 2021-04-18 14:01:29 +00:00
parent 5e7c17c576
commit c745c111da
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/bsd/tmux/dist/cmd-display-menu.c vendored
View File

@ -155,7 +155,7 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
else
format_add(ft, "popup_centre_x", "%ld", n);
n = (tty->sy - 1) / 2 + h / 2;
if (n >= tty->sy)
if ((unsigned long)n >= tty->sy)
format_add(ft, "popup_centre_y", "%u", tty->sy - h);
else
format_add(ft, "popup_centre_y", "%ld", n);
@ -188,7 +188,7 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
/* Position in pane. */
tty_window_offset(&tc->tty, &ox, &oy, &sx, &sy);
n = top + wp->yoff - oy + h;
if (n >= tty->sy)
if ((unsigned long)n >= tty->sy)
format_add(ft, "popup_pane_top", "%u", tty->sy - h);
else
format_add(ft, "popup_pane_top", "%ld", n);
@ -236,7 +236,7 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
yp = "#{popup_window_status_line_y}";
p = format_expand(ft, yp);
n = strtol(p, NULL, 10);
if (n < h)
if ((unsigned long)n < h)
n = 0;
else
n -= h;

4
external/bsd/tmux/dist/window-customize.c vendored
View File

@ -116,7 +116,7 @@ window_customize_get_tag(struct options_entry *o, int idx,
uint64_t offset;
if (oe == NULL)
return ((uint64_t)o);
return ((uintptr_t)o);
offset = ((const char *)oe - (const char *)options_table) / sizeof *options_table;
return ((2ULL << 62)|(offset << 32)|((idx + 1) << 1)|1);
}
@ -484,7 +484,7 @@ window_customize_build_keys(struct window_customize_modedata *data,
item->idx = -1;
expanded = format_expand(ft, data->format);
child = mode_tree_add(data->data, top, item, (uint64_t)bd,
child = mode_tree_add(data->data, top, item, (uintptr_t)bd,
expanded, NULL, 0);
free(expanded);

8
external/bsd/tmux/dist/window-tree.c vendored
View File

@ -1257,10 +1257,10 @@ window_tree_key(struct window_mode_entry *wme, struct client *c,
data->offset++;
break;
case 'H':
mode_tree_expand(data->data, (uint64_t)fsp->s);
mode_tree_expand(data->data, (uint64_t)fsp->wl);
if (!mode_tree_set_current(data->data, (uint64_t)wme->wp))
mode_tree_set_current(data->data, (uint64_t)fsp->wl);
mode_tree_expand(data->data, (uintptr_t)fsp->s);
mode_tree_expand(data->data, (uintptr_t)fsp->wl);
if (!mode_tree_set_current(data->data, (uintptr_t)wme->wp))
mode_tree_set_current(data->data, (uintptr_t)fsp->wl);
break;
case 'm':
window_tree_pull_item(item, &ns, &nwl, &nwp);