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/tools | |
| 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/tools')
| -rw-r--r-- | src/tools/tor-checkkey.c | 2 | ||||
| -rw-r--r-- | src/tools/tor-gencert.c | 2 | ||||
| -rw-r--r-- | src/tools/tor-resolve.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c index a24412499..94c8cbd44 100644 --- a/src/tools/tor-checkkey.c +++ b/src/tools/tor-checkkey.c @@ -6,7 +6,7 @@ #include <stdio.h> #include <stdlib.h> #include "crypto.h" -#include "log.h" +#include "torlog.h" #include "../common/util.h" #include "compat.h" #include <openssl/bn.h> diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index 13a640cb8..bc99c24bd 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -29,7 +29,7 @@ #include "compat.h" #include "../common/util.h" -#include "../common/log.h" +#include "../common/torlog.h" #include "crypto.h" #include "address.h" diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 2639d9e59..f5b0becaf 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -8,7 +8,7 @@ #include "compat.h" #include "../common/util.h" #include "address.h" -#include "../common/log.h" +#include "../common/torlog.h" #include <stdio.h> #include <stdlib.h> |