diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:19:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-23 01:19:04 -0400 |
| commit | b80a8bba199b9adfb9c893641ba770566fa548e1 (patch) | |
| tree | 2fba8dea9940d46863834f139ed350f7c0eaeffb /src/common/torlog.h | |
| parent | 1ba1bdee4bd8f3c00e603fe9b0fd2f14eeb60466 (diff) | |
| parent | 1e69c60dccc358a7146c2b5e7825ea729498b41b (diff) | |
| download | tor-b80a8bba199b9adfb9c893641ba770566fa548e1.tar.gz tor-b80a8bba199b9adfb9c893641ba770566fa548e1.zip | |
Merge branch 'feature3049-v2' into maint-0.2.2
Conflicts:
src/common/Makefile.am
Diffstat (limited to 'src/common/torlog.h')
| -rw-r--r-- | src/common/torlog.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/common/torlog.h b/src/common/torlog.h index 000e32ddab..541a0d1738 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -146,7 +146,6 @@ void change_callback_log_severity(int loglevelMin, int loglevelMax, void flush_pending_log_callbacks(void); void log_set_application_name(const char *name); -/* Outputs a message to stdout */ void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) CHECK_PRINTF(3,4); #define log tor_log /* hack it so we don't conflict with log() as much */ |