aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2018-12-07 16:35:23 +0200
committerGeorge Kadianakis <desnacked@riseup.net>2019-01-02 15:25:55 +0200
commit926fc93be5b6afab1a604ecd7c79aa6e8ae8a676 (patch)
treead9b0bd2298f8035734d777f42b1333fb5cf990d /src/core
parentdd04917851c23f16a11c0d2b0c62ea76c93c4c7d (diff)
downloadtor-926fc93be5b6afab1a604ecd7c79aa6e8ae8a676.tar.gz
tor-926fc93be5b6afab1a604ecd7c79aa6e8ae8a676.zip
Concentrate all TOR_USEC_PER_SEC definitions in a single header file.
Co-authored-by: Mike Perry <mikeperry-git@torproject.org>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/or/circuitpadding.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 5210265ff2..9f8713f624 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -17,6 +17,7 @@
#include "core/or/channel.h"
#include "lib/time/compat_time.h"
+#include "lib/defs/time.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "core/or/crypt_path_st.h"
@@ -31,10 +32,6 @@
#include "app/config/config.h"
-/* XXX: This is a dup of the constant in ./src/lib/time/tvdiff.c.
- * Should/Do we have a header for time constants like this? */
-#define TOR_USEC_PER_SEC (1000000)
-
static inline circpad_purpose_mask_t circpad_circ_purpose_to_mask(uint8_t
circ_purpose);
static inline circpad_circuit_state_t circpad_circuit_state(