diff options
| author | Denis Vlasenko | 2007-09-16 18:50:56 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-09-16 18:50:56 +0000 |
| commit | e755e827f7c8ecb21787a4369d7afdeda54d112b (patch) | |
| tree | 007b1506e69ffcc25bc6ba3b0e6686d806a34264 /networking | |
| parent | ed6ac53104d811ee88c71aff45c7cad666aaee46 (diff) | |
| download | busybox-e755e827f7c8ecb21787a4369d7afdeda54d112b.zip busybox-e755e827f7c8ecb21787a4369d7afdeda54d112b.tar.gz | |
apply post 1.7.0 patches, set version to 1.7.11_7_1
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/isrv.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/networking/isrv.c b/networking/isrv.c index 1a41dd4..080c60f 100644 --- a/networking/isrv.c +++ b/networking/isrv.c @@ -21,20 +21,6 @@ /* Helpers */ -/* Even if _POSIX_MONOTONIC_CLOCK is defined, this - * may require librt */ -#if 0 /*def _POSIX_MONOTONIC_CLOCK*/ -static time_t monotonic_time(void) -{ - struct timespec ts; - if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0) - time(&ts.tv_sec); - return ts.tv_sec; -} -#else -#define monotonic_time() (time(NULL)) -#endif - /* Opaque structure */ struct isrv_state_t { @@ -258,7 +244,7 @@ static void handle_fd_set(isrv_state_t *state, fd_set *fds, int (*h)(int, void * /* this peer is gone */ remove_peer(state, peer); } else if (TIMEOUT) { - TIMEO_TBL[peer] = monotonic_time(); + TIMEO_TBL[peer] = monotonic_sec(); } } } @@ -335,7 +321,7 @@ void isrv_run( break; if (timeout) { - time_t t = monotonic_time(); + time_t t = monotonic_sec(); if (t != CURTIME) { CURTIME = t; handle_timeout(state, do_timeout); |