-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy path436.cactusADM.patch
38 lines (32 loc) · 1.12 KB
/
436.cactusADM.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
diff --git a/DefaultTimers.c b/DefaultTimers.c
index 0d8e2ec..a4bd937 100644
--- a/DefaultTimers.c
+++ b/DefaultTimers.c
@@ -247,7 +247,6 @@ static void CCTKi_TimerGetTimeOfDayStart(int timernum, void *idata)
t_GetTimeOfDayTimer *data;
struct timeval tp;
- struct timezone tzp;
timernum = timernum;
data = (t_GetTimeOfDayTimer *)idata;
@@ -256,7 +255,7 @@ static void CCTKi_TimerGetTimeOfDayStart(int timernum, void *idata)
data->last.tv_sec = 0;
data->last.tv_usec = 0;
#else
- gettimeofday(&tp, &tzp);
+ gettimeofday(&tp, NULL);
data->last = tp;
#endif
@@ -299,7 +298,6 @@ static void CCTKi_TimerGetTimeOfDayStop(int timernum, void *idata)
t_GetTimeOfDayTimer *data;
struct timeval tp;
- struct timezone tzp;
timernum = timernum;
data = (t_GetTimeOfDayTimer *)idata;
@@ -308,7 +306,7 @@ static void CCTKi_TimerGetTimeOfDayStop(int timernum, void *idata)
data->total.tv_sec = 0;
data->total.tv_usec= 0;
#else
- gettimeofday(&tp, &tzp);
+ gettimeofday(&tp, NULL);
data->total.tv_sec += (tp.tv_sec - data->last.tv_sec);
data->total.tv_usec += (tp.tv_usec - data->last.tv_usec);