aboutsummaryrefslogtreecommitdiff
path: root/src/lib/evloop
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-10 15:20:28 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-10 15:20:30 -0400
commite7f5f48d68553206b95cbb4f610702c887500124 (patch)
tree75cbf04d94e08c92d48f3518d506ec1166e862df /src/lib/evloop
parent41640b65735ec6214aa5080c2143b0982a59bb93 (diff)
downloadtor-e7f5f48d68553206b95cbb4f610702c887500124.tar.gz
tor-e7f5f48d68553206b95cbb4f610702c887500124.zip
Rename torlog.[ch] to log.[ch]
Fun fact: these files used to be called log.[ch] until we ran into conflicts with systems having a log.h file. But now that we always include "lib/log/log.h", we should be fine.
Diffstat (limited to 'src/lib/evloop')
-rw-r--r--src/lib/evloop/compat_libevent.c2
-rw-r--r--src/lib/evloop/procmon.c2
-rw-r--r--src/lib/evloop/procmon.h2
-rw-r--r--src/lib/evloop/timers.c2
-rw-r--r--src/lib/evloop/workqueue.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/evloop/compat_libevent.c b/src/lib/evloop/compat_libevent.c
index 5e5faf163c..2ee71c5598 100644
--- a/src/lib/evloop/compat_libevent.c
+++ b/src/lib/evloop/compat_libevent.c
@@ -11,7 +11,7 @@
#include "lib/evloop/compat_libevent.h"
#include "lib/crypt_ops/crypto_rand.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#include "lib/string/compat_string.h"
diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c
index 53c458f159..e0c26caab2 100644
--- a/src/lib/evloop/procmon.c
+++ b/src/lib/evloop/procmon.c
@@ -8,7 +8,7 @@
#include "lib/evloop/procmon.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#include "lib/log/win32err.h"
#include "lib/malloc/malloc.h"
diff --git a/src/lib/evloop/procmon.h b/src/lib/evloop/procmon.h
index b596e5cc6d..42c3788692 100644
--- a/src/lib/evloop/procmon.h
+++ b/src/lib/evloop/procmon.h
@@ -11,7 +11,7 @@
#include "lib/evloop/compat_libevent.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
typedef struct tor_process_monitor_t tor_process_monitor_t;
diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c
index 4580b89e3c..c4e85c7c93 100644
--- a/src/lib/evloop/timers.c
+++ b/src/lib/evloop/timers.c
@@ -34,7 +34,7 @@
#include "lib/evloop/compat_libevent.h"
#include "lib/evloop/timers.h"
#include "lib/intmath/muldiv.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#include "lib/malloc/malloc.h"
#include "lib/time/compat_time.h"
diff --git a/src/lib/evloop/workqueue.c b/src/lib/evloop/workqueue.c
index 4d36f352e3..931f65e710 100644
--- a/src/lib/evloop/workqueue.c
+++ b/src/lib/evloop/workqueue.c
@@ -30,7 +30,7 @@
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/intmath/weakrng.h"
#include "lib/log/ratelim.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#include "lib/net/alertsock.h"
#include "lib/net/socket.h"