aboutsummaryrefslogtreecommitdiff
path: root/src/lib/evloop
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-10 15:16:57 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-10 15:16:57 -0400
commit41640b65735ec6214aa5080c2143b0982a59bb93 (patch)
treeb65163e29bd3960342b4977bde86dec4f9ef6b72 /src/lib/evloop
parent9ec80909ec7be3d9eea863dfc3f320bfe9072ae8 (diff)
downloadtor-41640b65735ec6214aa5080c2143b0982a59bb93.tar.gz
tor-41640b65735ec6214aa5080c2143b0982a59bb93.zip
Rename util_malloc to malloc.
Diffstat (limited to 'src/lib/evloop')
-rw-r--r--src/lib/evloop/compat_libevent.h2
-rw-r--r--src/lib/evloop/procmon.c2
-rw-r--r--src/lib/evloop/timers.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/evloop/compat_libevent.h b/src/lib/evloop/compat_libevent.h
index 7a5469047c..5fda49f741 100644
--- a/src/lib/evloop/compat_libevent.h
+++ b/src/lib/evloop/compat_libevent.h
@@ -11,7 +11,7 @@
#include "orconfig.h"
#include "lib/testsupport/testsupport.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
void configure_libevent_logging(void);
void suppress_libevent_log_msg(const char *msg);
diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c
index a923fbad74..53c458f159 100644
--- a/src/lib/evloop/procmon.c
+++ b/src/lib/evloop/procmon.c
@@ -11,7 +11,7 @@
#include "lib/log/torlog.h"
#include "lib/log/util_bug.h"
#include "lib/log/win32err.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
#include "lib/string/parse_int.h"
#ifdef HAVE_SIGNAL_H
diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c
index c07bd2e726..4580b89e3c 100644
--- a/src/lib/evloop/timers.c
+++ b/src/lib/evloop/timers.c
@@ -36,7 +36,7 @@
#include "lib/intmath/muldiv.h"
#include "lib/log/torlog.h"
#include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
#include "lib/time/compat_time.h"
#ifdef _WIN32