commit 820eced29082c1bd3318a556020c5c30bacc38eb
author Elliott Hughes <enh@google.com> Fri Aug 20 18:00:50 2021 -0700
committer Elliott Hughes <enh@google.com> Mon Aug 23 17:33:37 2021 -0700
tree 2bd1e899a8d6c219d6b27291dac115548788ee17
parent ffc110a86fa7c7359cf851a917ae49ae1cb8d6d9

Upgrade tcpdump to tcpdump-4.99.1

Test: make
Change-Id: I052ed8f5279c806e4d2ff925f581b71db3ac03c0

timeval-operations.h

diff --git a/timeval-operations.h b/timeval-operations.h
index 4f4e85c..177027d 100644
--- a/timeval-operations.h
+++ b/timeval-operations.h
@@ -30,19 +30,14 @@
 
 /* Operations on timevals. */
 
-#ifndef _MICRO_PER_SEC
-#define _MICRO_PER_SEC 1000000
-#endif
-
-#ifndef _NANO_PER_SEC
-#define _NANO_PER_SEC 1000000000
-#endif
+#define ND_MICRO_PER_SEC 1000000
+#define ND_NANO_PER_SEC 1000000000
 
 #define netdissect_timevalclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
 
 #define netdissect_timevalisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
 
-#define netdissect_timevalcmp(tvp, uvp, cmp)      \
+#define netdissect_timevalcmp(tvp, uvp, cmp)   \
 	(((tvp)->tv_sec == (uvp)->tv_sec) ?    \
 	 ((tvp)->tv_usec cmp (uvp)->tv_usec) : \
 	 ((tvp)->tv_sec cmp (uvp)->tv_sec))
@@ -52,14 +47,14 @@
 		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;    \
 		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
 		if (nano_prec) {                                  \
-			if ((vvp)->tv_usec >= _NANO_PER_SEC) {    \
+			if ((vvp)->tv_usec >= ND_NANO_PER_SEC) {  \
 				(vvp)->tv_sec++;                  \
-				(vvp)->tv_usec -= _NANO_PER_SEC;  \
+				(vvp)->tv_usec -= ND_NANO_PER_SEC; \
 			}                                         \
 		} else {                                          \
-			if ((vvp)->tv_usec >= _MICRO_PER_SEC) {   \
+			if ((vvp)->tv_usec >= ND_MICRO_PER_SEC) { \
 				(vvp)->tv_sec++;                  \
-				(vvp)->tv_usec -= _MICRO_PER_SEC; \
+				(vvp)->tv_usec -= ND_MICRO_PER_SEC; \
 			}                                         \
 		}                                                 \
 	} while (0)
@@ -70,8 +65,8 @@
 		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;  \
 		if ((vvp)->tv_usec < 0) {                          \
 		    (vvp)->tv_sec--;                               \
-		    (vvp)->tv_usec += (nano_prec ? _NANO_PER_SEC : \
-				       _MICRO_PER_SEC);            \
+		    (vvp)->tv_usec += (nano_prec ? ND_NANO_PER_SEC : \
+				       ND_MICRO_PER_SEC);          \
 		}                                                  \
 	} while (0)