On Solaris, for 64-bit builds, use the 64-bit pcap-config.

[tcpdump] / timeval-operations.h

diff --git a/timeval-operations.h b/timeval-operations.h
index e365939fcb0ef6d8f317dd34fad1c81914befd9c..177027db031d91267e0c7866c69c862f2956008e 100644 (file)
--- a/timeval-operations.h
+++ b/timeval-operations.h
@@ -25,54 +25,49 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef tcpdump_timeval_operations_h
-#define tcpdump_timeval_operations_h
+#ifndef netdissect_timeval_operations_h
+#define netdissect_timeval_operations_h
 
 /* Operations on timevals. */
 
-#ifndef _MICRO_PER_SEC
-#define _MICRO_PER_SEC 1000000
-#endif
+#define ND_MICRO_PER_SEC 1000000
+#define ND_NANO_PER_SEC 1000000000
 
-#ifndef _NANO_PER_SEC
-#define _NANO_PER_SEC 1000000000
-#endif
+#define netdissect_timevalclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
 
-#define tcpdump_timevalclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
+#define netdissect_timevalisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
 
-#define tcpdump_timevalisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
-
-#define tcpdump_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))
 
-#define tcpdump_timevaladd(tvp, uvp, vvp, nano_prec)              \
+#define netdissect_timevaladd(tvp, uvp, vvp, nano_prec)           \
        do {                                                      \
                (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)
 
-#define tcpdump_timevalsub(tvp, uvp, vvp, nano_prec)               \
+#define netdissect_timevalsub(tvp, uvp, vvp, nano_prec)            \
        do {                                                       \
                (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;     \
                (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)
 
-#endif /* tcpdump_timeval_operations_h */
+#endif /* netdissect_timeval_operations_h */