diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-14 10:06:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-14 10:06:00 -0400 |
| commit | e4ce8cd9691708d9bc0bcc9904d656fe35001946 (patch) | |
| tree | 5a9a5b6a4253a7f92e912ee731e1b97ed67cc79b /src/or/main.c | |
| parent | 56bd3dd87ff35863ca0fd21aab339d65ba839479 (diff) | |
| download | tor-e4ce8cd9691708d9bc0bcc9904d656fe35001946.tar tor-e4ce8cd9691708d9bc0bcc9904d656fe35001946.tar.gz | |
Fix compilation with older gccs
They don't like to have #preprocessor directives inside macro arguments.
Fixes #6842; fix on 0.2.4.2-alpha.
Found by grarpamp.
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/main.c b/src/or/main.c index 01da7a448..635dcb4bd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2309,13 +2309,14 @@ tor_init(int argc, char *argv[]) { const char *version = get_version(); - log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s " - "and OpenSSL %s.", version, + const char *bev_str = #ifdef USE_BUFFEREVENTS - "(with bufferevents) ", + "(with bufferevents) "; #else - "", + ""; #endif + log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s " + "and OpenSSL %s.", version, bev_str, get_uname(), tor_libevent_get_version_str(), crypto_openssl_get_version_str()); |