summaryrefslogtreecommitdiff
path: root/src/lib/net
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/net
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/net')
-rw-r--r--src/lib/net/address.c2
-rw-r--r--src/lib/net/buffers_net.c2
-rw-r--r--src/lib/net/socket.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/net/address.c b/src/lib/net/address.c
index ca0c2a46c4..619fa13e9b 100644
--- a/src/lib/net/address.c
+++ b/src/lib/net/address.c
@@ -42,7 +42,7 @@
#include "lib/net/socket.h"
#include "lib/container/smartlist.h"
#include "lib/ctime/di_ops.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/escape.h"
#include "lib/malloc/malloc.h"
#include "lib/net/inaddr.h"
diff --git a/src/lib/net/buffers_net.c b/src/lib/net/buffers_net.c
index 2e6a096a06..c52ea2784e 100644
--- a/src/lib/net/buffers_net.c
+++ b/src/lib/net/buffers_net.c
@@ -12,7 +12,7 @@
#define BUFFERS_PRIVATE
#include "lib/net/buffers_net.h"
#include "lib/container/buffers.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#include "lib/net/nettypes.h"
diff --git a/src/lib/net/socket.c b/src/lib/net/socket.c
index 1b3238d998..5847bb8734 100644
--- a/src/lib/net/socket.c
+++ b/src/lib/net/socket.c
@@ -15,7 +15,7 @@
#include "lib/cc/compat_compiler.h"
#include "lib/err/torerr.h"
#include "lib/lock/compat_mutex.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#ifdef _WIN32