diff options
| author | Thomas Adam <thomas@xteddy.org> | 2012-10-16 18:30:36 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2012-10-16 18:30:36 +0100 |
| commit | d4dc52ec8451c51b8566ebbcfdb2210a556facdc (patch) | |
| tree | 78bddf9141c16265271c99757e98f6d538abc32b | |
| parent | a91c5989717da36a78beacdc75ab96412ec791a2 (diff) | |
| parent | c695c0c085ea7a603f740479eccdc2cf7836e626 (diff) | |
| download | rtmux-d4dc52ec8451c51b8566ebbcfdb2210a556facdc.tar.gz rtmux-d4dc52ec8451c51b8566ebbcfdb2210a556facdc.tar.bz2 rtmux-d4dc52ec8451c51b8566ebbcfdb2210a556facdc.zip | |
Merge branch 'obsd-master'
Sync from OpenBSD.
| -rw-r--r-- | cmd-list-clients.c | 2 | ||||
| -rw-r--r-- | cmd-list-keys.c | 2 | ||||
| -rw-r--r-- | cmd-new-window.c | 2 | ||||
| -rw-r--r-- | cmd-swap-window.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cmd-list-clients.c b/cmd-list-clients.c index e906f63c..19976cfd 100644 --- a/cmd-list-clients.c +++ b/cmd-list-clients.c @@ -28,7 +28,7 @@ * List all clients. */ -int cmd_list_clients_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_list_clients_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_list_clients_entry = { "list-clients", "lsc", diff --git a/cmd-list-keys.c b/cmd-list-keys.c index afd5b4a3..51eeb674 100644 --- a/cmd-list-keys.c +++ b/cmd-list-keys.c @@ -97,7 +97,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmd_ctx *ctx) return (CMD_RETURN_NORMAL); } -int +enum cmd_retval cmd_list_keys_table(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; diff --git a/cmd-new-window.c b/cmd-new-window.c index 81919439..f8a76120 100644 --- a/cmd-new-window.c +++ b/cmd-new-window.c @@ -26,7 +26,7 @@ * Create a new window. */ -int cmd_new_window_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_new_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_new_window_entry = { "new-window", "neww", diff --git a/cmd-swap-window.c b/cmd-swap-window.c index 4c955402..f0c9ffe2 100644 --- a/cmd-swap-window.c +++ b/cmd-swap-window.c @@ -26,7 +26,7 @@ * Swap one window with another. */ -int cmd_swap_window_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_swap_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_swap_window_entry = { "swap-window", "swapw", |