diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2023-06-08 11:17:30 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2023-06-08 11:17:30 +0000 |
| commit | 339d074149a2d38004a6ead707d91e061eaae181 (patch) | |
| tree | a4cbc386d85b9be19e16172508242644f4807ef5 | |
| parent | 848a36902b950735ffbf30f55b879e791afc48c6 (diff) | |
Fix mismatch between function prototype and definition, from Anindya
Mukherjee.
| -rw-r--r-- | usr.bin/tmux/popup.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/tmux/popup.c b/usr.bin/tmux/popup.c index ad2e1c8cda8..cafbc168c1c 100644 --- a/usr.bin/tmux/popup.c +++ b/usr.bin/tmux/popup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: popup.c,v 1.48 2023/03/15 19:23:22 nicm Exp $ */ +/* $OpenBSD: popup.c,v 1.49 2023/06/08 11:17:28 nicm Exp $ */ /* * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -637,7 +637,7 @@ int popup_display(int flags, enum box_lines lines, struct cmdq_item *item, u_int px, u_int py, u_int sx, u_int sy, struct environ *env, const char *shellcmd, int argc, char **argv, const char *cwd, const char *title, struct client *c, - struct session *s, const char* style, const char* border_style, + struct session *s, const char *style, const char *border_style, popup_close_cb cb, void *arg) { struct popup_data *pd; diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index ff4512e97f9..9f7a761f959 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.1198 2023/05/08 10:03:39 tb Exp $ */ +/* $OpenBSD: tmux.h,v 1.1199 2023/06/08 11:17:29 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -2890,8 +2890,8 @@ void screen_write_hline(struct screen_write_ctx *, u_int, int, int); void screen_write_vline(struct screen_write_ctx *, u_int, int, int); void screen_write_menu(struct screen_write_ctx *, struct menu *, int, const struct grid_cell *); -void screen_write_box(struct screen_write_ctx *, u_int, u_int, int, - const struct grid_cell *, const char *); +void screen_write_box(struct screen_write_ctx *, u_int, u_int, + enum box_lines, const struct grid_cell *, const char *); void screen_write_preview(struct screen_write_ctx *, struct screen *, u_int, u_int); void screen_write_backspace(struct screen_write_ctx *); @@ -3316,11 +3316,11 @@ int menu_key_cb(struct client *, void *, struct key_event *); #define POPUP_INTERNAL 0x4 typedef void (*popup_close_cb)(int, void *); typedef void (*popup_finish_edit_cb)(char *, size_t, void *); -int popup_display(int, int, struct cmdq_item *, u_int, u_int, - u_int, u_int, struct environ *, const char *, int, char **, - const char *, const char *, struct client *, - struct session *, const char *, const char *, - popup_close_cb, void *); +int popup_display(int, enum box_lines, struct cmdq_item *, u_int, + u_int, u_int, u_int, struct environ *, const char *, int, + char **, const char *, const char *, struct client *, + struct session *, const char *, const char *, + popup_close_cb, void *); int popup_editor(struct client *, const char *, size_t, popup_finish_edit_cb, void *); |