diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-07-09 21:52:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-07-09 22:05:38 -0400 |
| commit | 14bc4dcc229fe45af48986820020779b440149cb (patch) | |
| tree | 513ee7d878975353240bf41b4211b4ad2456133d /src/or | |
| parent | c3febf8660518f77ec890afe339c353dfcb61a87 (diff) | |
| download | tor-14bc4dcc229fe45af48986820020779b440149cb.tar tor-14bc4dcc229fe45af48986820020779b440149cb.tar.gz | |
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/or')
| -rw-r--r-- | src/or/buffers.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 970c1888c..c4ebc8135 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -13,7 +13,7 @@ #define BUFFERS_PRIVATE #include "or.h" #include "../common/util.h" -#include "../common/log.h" +#include "../common/torlog.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/or/or.h b/src/or/or.h index 60987698b..2124d457e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -82,7 +82,7 @@ #include "crypto.h" #include "tortls.h" -#include "../common/log.h" +#include "../common/torlog.h" #include "compat.h" #include "container.h" #include "util.h" |