diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-12-22 02:32:26 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-12-22 02:32:26 +0000 |
| commit | 32978afa5481f66c9ff4fb7ededbdecf6800c16c (patch) | |
| tree | 3bf7fdc0ad64e66a100f0a987c9777a671a41136 /src/common/util.h | |
| parent | 64195e380d08b7e293071392ffb16d5691129eda (diff) | |
| download | tor-32978afa5481f66c9ff4fb7ededbdecf6800c16c.tar tor-32978afa5481f66c9ff4fb7ededbdecf6800c16c.tar.gz | |
Workaround for brain-damaged __FILE__ handling on MSVC: keep Nick's name out
of the warning messages.
svn:r3199
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/util.h b/src/common/util.h index 9fe7262aa..f1b1bff61 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -13,6 +13,7 @@ #include "orconfig.h" #include "torint.h" +#include "compat.h" #include <stdio.h> #ifdef HAVE_SYS_TIME_H #include <sys/time.h> @@ -38,7 +39,7 @@ #define tor_assert(expr) do { \ if (!(expr)) { \ log(LOG_ERR, "%s:%d: %s: Assertion %s failed; aborting.", \ - __FILE__, __LINE__, __FUNCTION__, #expr); \ + _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \ assert(expr); /* write to console too. */ \ abort(); /* unreached */ \ } } while (0) |