summaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-12-16 12:57:27 -0500
committerNick Mathewson <nickm@torproject.org>2020-01-09 07:30:35 -0500
commit7b0d8834f2d762f610291a1c4ffe1f775f46a5f1 (patch)
tree2bceace3000dcc522dac0899860ca18a46b7c9d2 /src/ext
parent73b83b8f1a92aee93543095c96ae59ed6ba064a2 (diff)
downloadtor-7b0d8834f2d762f610291a1c4ffe1f775f46a5f1.tar.gz
tor-7b0d8834f2d762f610291a1c4ffe1f775f46a5f1.zip
Use raw_assert in ht.h
Also, include torerr.h from ht.h if we are using raw_assert. Otherwise, our includes need to be ordered so that ht.h comes after util_log.h.
Diffstat (limited to 'src/ext')
-rw-r--r--src/ext/ht.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ext/ht.h b/src/ext/ht.h
index bb5604131b..9d4add1936 100644
--- a/src/ext/ht.h
+++ b/src/ext/ht.h
@@ -226,7 +226,8 @@ ht_string_hash(const char *s)
(x) = HT_NEXT(name, head, x))
#ifndef HT_NDEBUG
-#define HT_ASSERT_(x) tor_assert(x)
+#include "lib/err/torerr.h"
+#define HT_ASSERT_(x) raw_assert(x)
#else
#define HT_ASSERT_(x) (void)0
#endif