diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-27 12:47:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-27 12:47:08 -0400 |
| commit | 300e3bebd19b2686501d5400da1ca4a748027ba4 (patch) | |
| tree | 5074d1ad9e0e7e326f696e9409ea4e4d012e72cf /src/lib/log | |
| parent | 0742b387253f25c74ad2084a232b7f7fd68db1be (diff) | |
| parent | 82a7343b061b110cb97e4d804f989bc34ee120c9 (diff) | |
| download | tor-300e3bebd19b2686501d5400da1ca4a748027ba4.tar.gz tor-300e3bebd19b2686501d5400da1ca4a748027ba4.zip | |
Merge branch 'ticket26494'
Diffstat (limited to 'src/lib/log')
| -rw-r--r-- | src/lib/log/.may_include | 2 | ||||
| -rw-r--r-- | src/lib/log/torlog.c | 6 | ||||
| -rw-r--r-- | src/lib/log/util_bug.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/log/.may_include b/src/lib/log/.may_include index 36a164cce0..852173aab3 100644 --- a/src/lib/log/.may_include +++ b/src/lib/log/.may_include @@ -1,7 +1,7 @@ orconfig.h lib/cc/*.h -lib/container/smartlist.h +lib/smartlist_core/*.h lib/err/*.h lib/fdio/*.h lib/intmath/*.h diff --git a/src/lib/log/torlog.c b/src/lib/log/torlog.c index 5709dd8199..bffffbf1bd 100644 --- a/src/lib/log/torlog.c +++ b/src/lib/log/torlog.c @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */ /** - * \file log.c + * \file torlog.c * \brief Functions to send messages to log files or the console. **/ @@ -34,7 +34,9 @@ #include "lib/log/torlog.h" #include "lib/log/ratelim.h" #include "lib/lock/compat_mutex.h" -#include "lib/container/smartlist.h" +#include "lib/smartlist_core/smartlist_core.h" +#include "lib/smartlist_core/smartlist_foreach.h" +#include "lib/smartlist_core/smartlist_split.h" #include "lib/err/torerr.h" #include "lib/intmath/bits.h" #include "lib/string/compat_string.h" diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c index 161b65e0bf..78af08f022 100644 --- a/src/lib/log/util_bug.c +++ b/src/lib/log/util_bug.c @@ -12,7 +12,8 @@ #include "lib/log/torlog.h" #include "lib/err/backtrace.h" #ifdef TOR_UNIT_TESTS -#include "lib/container/smartlist.h" +#include "lib/smartlist_core/smartlist_core.h" +#include "lib/smartlist_core/smartlist_foreach.h" #endif #include "lib/malloc/util_malloc.h" #include "lib/string/printf.h" |