summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm>2023-06-08 11:17:28 +0000
committernicm <nicm>2023-06-08 11:17:28 +0000
commitbdd05bdbd3ee204d4bc7f4fad5a0bedc4ab6c254 (patch)
tree4e60630602ab89576f64d2f7b06077105fcc2083
parent1d98394b411d8f6c9a3be862a541b34fbd6c97f5 (diff)
Fix mismatch between function prototype and definition, from Anindya
Mukherjee.
-rw-r--r--popup.c2
-rw-r--r--tmux.h14
2 files changed, 8 insertions, 8 deletions
diff --git a/popup.c b/popup.c
index 33325ab2..2195adf5 100644
--- a/popup.c
+++ b/popup.c
@@ -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/tmux.h b/tmux.h
index b43a2af0..bd2f6a63 100644
--- a/tmux.h
+++ b/tmux.h
@@ -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 *);