From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 Dec 2019 17:57:27 +0000 (-0500)
Subject: Use raw_assert in ht.h
X-Git-Tag: tor-0.4.3.1-alpha~40^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b0d8834f2d762f610291a1c4ffe1f775f46a5f1;p=thirdparty%2Ftor.git

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.
---

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