aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-02-09 14:53:51 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-02-09 14:53:51 +0000
commit648ce2f56adc071f93516887cf4a4c32f631d54e (patch)
treec0d2438bd54d426e6dab3fbcd833ce3408adc215 /server-client.c
parent0648c587162da4eae0805e35805454c46be70321 (diff)
parent01da28efb112ef2096a80da616ca190d59ba9b52 (diff)
downloadrtmux-648ce2f56adc071f93516887cf4a4c32f631d54e.tar.gz
rtmux-648ce2f56adc071f93516887cf4a4c32f631d54e.tar.bz2
rtmux-648ce2f56adc071f93516887cf4a4c32f631d54e.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c
index aa44a4a5..796390f7 100644
--- a/server-client.c
+++ b/server-client.c
@@ -330,7 +330,7 @@ int
server_client_assume_paste(struct session *s)
{
struct timeval tv;
- u_int t;
+ int t;
if ((t = options_get_number(&s->options, "assume-paste-time")) == 0)
return (0);