1 |
vip-ire |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' diald-1.0/diald.c mezzanine_patched_diald-1.0/diald.c |
2 |
|
|
--- diald-1.0/diald.c 2001-06-16 13:51:39.000000000 -0600 |
3 |
|
|
+++ mezzanine_patched_diald-1.0/diald.c 2007-03-21 13:11:51.000000000 -0600 |
4 |
|
|
@@ -189,10 +189,10 @@ |
5 |
|
|
if (proxy.fd >= 0) FD_SET(proxy.fd, &readfds); |
6 |
|
|
if (snoopfd >= 0) FD_SET(snoopfd, &readfds); |
7 |
|
|
/* Compute the likely timeout for the next second boundary */ |
8 |
|
|
- ts = tstamp + PAUSETIME*CLK_TCK - ticks(); |
9 |
|
|
+ ts = tstamp + PAUSETIME*CLOCKS_PER_SEC - ticks(); |
10 |
|
|
if (ts < 0) ts = 0; |
11 |
|
|
- timeout.tv_sec = ts/CLK_TCK; |
12 |
|
|
- timeout.tv_usec = 1000*(ts%CLK_TCK)/CLK_TCK; |
13 |
|
|
+ timeout.tv_sec = ts/CLOCKS_PER_SEC; |
14 |
|
|
+ timeout.tv_usec = 1000*(ts%CLOCKS_PER_SEC)/CLOCKS_PER_SEC; |
15 |
|
|
sel = select(256,&readfds,0,0,&timeout); |
16 |
|
|
if (sel < 0 && errno == EBADF) { |
17 |
|
|
PIPE *p; |
18 |
|
|
@@ -278,7 +278,7 @@ |
19 |
|
|
/* check if ticks() has advanced a second since last check. |
20 |
|
|
* This is immune to wall clock skew because we use the ticks count. |
21 |
|
|
*/ |
22 |
|
|
- ts = tstamp + PAUSETIME*CLK_TCK - ticks(); |
23 |
|
|
+ ts = tstamp + PAUSETIME*CLOCKS_PER_SEC - ticks(); |
24 |
|
|
if (ts <= 0) { |
25 |
|
|
tstamp = ticks(); |
26 |
|
|
fire_timers(); |
27 |
|
|
diff -Nur -x '*.orig' -x '*.rej' diald-1.0/timer.c mezzanine_patched_diald-1.0/timer.c |
28 |
|
|
--- diald-1.0/timer.c 2001-06-16 14:16:22.000000000 -0600 |
29 |
|
|
+++ mezzanine_patched_diald-1.0/timer.c 2007-03-21 13:11:44.000000000 -0600 |
30 |
|
|
@@ -35,7 +35,7 @@ |
31 |
|
|
unsigned long timestamp() |
32 |
|
|
{ |
33 |
|
|
struct tms buf; |
34 |
|
|
- return times(&buf)/CLK_TCK; |
35 |
|
|
+ return times(&buf)/CLOCKS_PER_SEC; |
36 |
|
|
} |
37 |
|
|
|
38 |
|
|
unsigned long ticks() |