View | Details | Raw Unified | Return to bug 230059
Collapse All | Expand All

(-)net/owamp/files/patch-owamp_owamp.h (+49 lines)
Line 0 Link Here
1
--- owamp/owamp.h.orig	2012-03-27 02:23:05 UTC
2
+++ owamp/owamp.h
3
@@ -1635,14 +1635,13 @@ OWPTestDiskspace(
4
 #define timespecisset(tvp)      ((tvp)->tv_sec || (tvp)->tv_nsec)
5
 #endif
6
 
7
-#ifndef timespeccmp
8
+#undef	timespeccmp
9
 #define timespeccmp(tvp, uvp, cmp)          \
10
     (((tvp)->tv_sec == (uvp)->tv_sec) ?     \
11
      ((tvp)->tv_nsec cmp (uvp)->tv_nsec) :  \
12
      ((tvp)->tv_sec cmp (uvp)->tv_sec))
13
-#endif
14
 
15
-#ifndef        timespecadd
16
+#undef	timespecadd
17
 #define timespecadd(vvp, uvp)               \
18
     do {                                    \
19
         (vvp)->tv_sec += (uvp)->tv_sec;     \
20
@@ -1652,9 +1651,8 @@ OWPTestDiskspace(
21
             (vvp)->tv_nsec -= 1000000000;   \
22
         }                                   \
23
     } while (0)
24
-#endif
25
 
26
-#ifndef timespecsub
27
+#undef	timespecsub
28
 #define timespecsub(vvp, uvp)               \
29
     do {                                    \
30
         (vvp)->tv_sec -= (uvp)->tv_sec;     \
31
@@ -1664,9 +1662,8 @@ OWPTestDiskspace(
32
             (vvp)->tv_nsec += 1000000000;   \
33
         }                                   \
34
     } while (0)
35
-#endif
36
 
37
-#ifndef        timespecdiff
38
+#undef		timespecdiff
39
 #define        timespecdiff(vvp,uvp)        \
40
     do {                                    \
41
         struct timespec        ts1_,ts2_;   \
42
@@ -1680,7 +1677,6 @@ OWPTestDiskspace(
43
         timespecsub(&ts1_,&ts2_);           \
44
         *vvp = ts1_;                        \
45
     } while(0)
46
-#endif
47
 
48
 extern OWPNum64
49
 OWPGetRTTBound(

Return to bug 230059