diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2008-08-28 17:45:30 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2008-08-28 17:45:30 +0000 |
| commit | 33aa9315414dca1218b3c88b0c5ffc89d4379974 (patch) | |
| tree | 1594150f11001adb185809b5f593ed4be14f3dbe /server-fn.c | |
| parent | 0abb4ca413d3df152a969d5141622771ddc1f9fa (diff) | |
| download | rtmux-33aa9315414dca1218b3c88b0c5ffc89d4379974.tar.gz rtmux-33aa9315414dca1218b3c88b0c5ffc89d4379974.tar.bz2 rtmux-33aa9315414dca1218b3c88b0c5ffc89d4379974.zip | |
Support OS X by moving to gettimeofday(2) and adding poll compat from OpenSSH.
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server-fn.c b/server-fn.c index f766ba38..ba3def83 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.49 2008-06-22 22:28:33 nicm Exp $ */ +/* $Id: server-fn.c,v 1.50 2008-08-28 17:45:27 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -17,9 +17,9 @@ */ #include <sys/types.h> +#include <sys/time.h> #include <string.h> -#include <time.h> #include <unistd.h> #include "tmux.h" @@ -27,17 +27,17 @@ void server_set_client_message(struct client *c, const char *msg) { - struct timespec ts; + struct timeval tv; int delay; delay = options_get_number(&c->session->options, "display-time"); - ts.tv_sec = delay / 1000; - ts.tv_nsec = (delay % 1000) * 1000000L; + tv.tv_sec = delay / 1000; + tv.tv_usec = (delay % 1000) * 1000L; c->message_string = xstrdup(msg); - if (clock_gettime(CLOCK_REALTIME, &c->message_timer) != 0) - fatal("clock_gettime"); - timespecadd(&c->message_timer, &ts, &c->message_timer); + if (gettimeofday(&c->message_timer, NULL) != 0) + fatal("gettimeofday"); + timeradd(&c->message_timer, &tv, &c->message_timer); c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE); c->flags |= CLIENT_STATUS; |