eloop: header is now the single source of truth for SEC_PER_SEC

Saves duplication

diff --git a/src/common.h b/src/common.h
index 9d41a48a1c74ad0ce03080911708a511ed4e73e2..1d6f17227d98e0296168783b05125f364bb791b7 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -51,11 +51,6 @@
 #define ROUNDUP4(a)            (1 + (((a) - 1) |  3))
 #define ROUNDUP8(a)            (1 + (((a) - 1) |  7))
 
-#define NSEC_PER_SEC           1000000000L
-#define MSEC_PER_SEC           1000
-#define CSEC_PER_SEC           100L
-#define NSEC_PER_CSEC          10000000L
-
 /* Some systems don't define timespec macros */
 #ifndef timespecclear
 #define timespecclear(tsp)      (tsp)->tv_sec = (time_t)((tsp)->tv_nsec = 0L)

diff --git a/src/eloop.c b/src/eloop.c
index 5a710aec72633ad2d6de44e96b17326805bec488..6e988c8459027aaae1da456a465848558417414f 100644 (file)
--- a/src/eloop.c
+++ b/src/eloop.c
@@ -95,12 +95,6 @@
 #endif
 #endif
 
-#ifndef MSEC_PER_SEC
-#define MSEC_PER_SEC   1000
-#define NSEC_PER_MSEC  1000000L
-#define NSEC_PER_SEC   1000000000U
-#endif
-
 #if defined(HAVE_KQUEUE)
 #include <sys/event.h>
 #include <fcntl.h>

diff --git a/src/eloop.h b/src/eloop.h
index ea608189037cd74008567658af8768ac82a159d7..c4942131414bf4277a253b7f6382026f87353f2d 100644 (file)
--- a/src/eloop.h
+++ b/src/eloop.h
@@ -31,6 +31,13 @@
 
 #include <time.h>
 
+/* Handy macros to create subsecond timeouts */
+#define        CSEC_PER_SEC            100
+#define        MSEC_PER_SEC            1000
+#define        NSEC_PER_CSEC           10000000
+#define        NSEC_PER_MSEC           1000000
+#define        NSEC_PER_SEC            1000000000
+
 /* eloop queues are really only for deleting timeouts registered
  * for a function or object.
  * The idea being that one interface has different timeouts for