The branch, master has been updated
via d4dc52ec8451c51b8566ebbcfdb2210a556facdc (commit)
via c695c0c085ea7a603f740479eccdc2cf7836e626 (commit)
from a91c5989717da36a78beacdc75ab96412ec791a2 (commit)
- Log -----------------------------------------------------------------
commit d4dc52ec8451c51b8566ebbcfdb2210a556facdc
Merge: a91c598 c695c0c
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Merge branch 'obsd-master'
Sync from OpenBSD.
cmd-list-clients.c | 2 +-
cmd-list-keys.c | 2 +-
cmd-new-window.c | 2 +-
cmd-swap-window.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit c695c0c085ea7a603f740479eccdc2cf7836e626
Author: Nicholas Marriott <n...@openbsd.org>
Commit: Nicholas Marriott <n...@openbsd.org>
Fix some function prototypes from Helmut Tessarek.
---
cmd-list-clients.c | 2 +-
cmd-list-keys.c | 2 +-
cmd-new-window.c | 2 +-
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 ba47968..92d25a9 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 d93f368..ff6421a 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 1d9a1e6..2f11193 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 afd55e0..b2e2c11 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",
-----------------------------------------------------------------------
Summary of changes:
cmd-list-clients.c | 2 +-
cmd-list-keys.c | 2 +-
cmd-new-window.c | 2 +-
cmd-swap-window.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
