diff options
| author | Roger Dingledine <arma@torproject.org> | 2003-10-07 16:30:05 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2003-10-07 16:30:05 +0000 |
| commit | de6cbe53c0caaf09e6e870b50463fa3ad37dfd6f (patch) | |
| tree | 0a67bb89726ce6020cac92b9edf7963180373359 /src/common/log.h | |
| parent | e826873ac657782fde5e635d75de5443ac27fed4 (diff) | |
| download | tor-de6cbe53c0caaf09e6e870b50463fa3ad37dfd6f.tar.gz tor-de6cbe53c0caaf09e6e870b50463fa3ad37dfd6f.zip | |
some early bugfixes
our log() conflicts with log(3)
distribute only the correct files from doc/ and src/config/
sometimes laptops go back in time. i guess that's ok for now.
and bump the version number because we're live.
svn:r544
Diffstat (limited to 'src/common/log.h')
| -rw-r--r-- | src/common/log.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/log.h b/src/common/log.h index 9b9d072eec..8e0e5fc33d 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -36,7 +36,7 @@ void close_logs(); void reset_logs(); /* Outputs a message to stdout */ -void log(int severity, const char *format, ...) CHECK_PRINTF(2,3); +void _log(int severity, const char *format, ...) CHECK_PRINTF(2,3); #ifdef __GNUC__ void _log_fn(int severity, const char *funcname, const char *format, ...) @@ -44,8 +44,9 @@ void _log_fn(int severity, const char *funcname, const char *format, ...) #define log_fn(severity, args...) \ _log_fn(severity, __PRETTY_FUNCTION__, args) #else -#define log_fn log +#define log_fn _log #endif +#define log _log /* hack it so we don't conflict with log() as much */ # define __LOG_H #endif |