summaryrefslogtreecommitdiff
path: root/src/common/aes.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-07-09 21:52:20 -0400
committerNick Mathewson <nickm@torproject.org>2010-07-09 22:05:38 -0400
commit14bc4dcc229fe45af48986820020779b440149cb (patch)
tree513ee7d878975353240bf41b4211b4ad2456133d /src/common/aes.c
parentc3febf8660518f77ec890afe339c353dfcb61a87 (diff)
downloadtor-14bc4dcc229fe45af48986820020779b440149cb.tar.gz
tor-14bc4dcc229fe45af48986820020779b440149cb.zip
Rename log.h to torlog.h
This should make us conflict less with system files named "log.h". Yes, we shouldn't have been conflicting with those anyway, but some people's compilers act very oddly. The actual change was done with one "git mv", by editing Makefile.am, and running find . -name '*.[ch]' | xargs perl -i -pe 'if (/^#include.*\Wlog.h/) {s/log.h/torlog.h/; }'
Diffstat (limited to 'src/common/aes.c')
-rw-r--r--src/common/aes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/aes.c b/src/common/aes.c
index 2b6f0234b7..a17328317e 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -21,7 +21,7 @@
#include "compat.h"
#include "aes.h"
#include "util.h"
-#include "log.h"
+#include "torlog.h"
/* We have 3 strategies for getting AES: Via OpenSSL's AES_encrypt function,
* via OpenSSL's EVP_EncryptUpdate function, or via the built-in AES