diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-06-10 20:04:13 +0000 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-10-28 10:37:45 -0400 |
| commit | 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc (patch) | |
| tree | b26ca5da5f027aef067d2cb4a349800128060b76 | |
| parent | 7c4fd150cd19ebdafe64b800282184014b43d9fb (diff) | |
| download | tor-31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc.tar.gz tor-31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc.zip | |
Fix compilation on systems with older compilers.
This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.
See: tpo/core/tor#40410
| -rw-r--r-- | changes/ticket40410 | 4 | ||||
| -rw-r--r-- | src/feature/dirclient/dirclient.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/ticket40410 b/changes/ticket40410 new file mode 100644 index 0000000000..90d6f4be63 --- /dev/null +++ b/changes/ticket40410 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix a compilation error when trying to build Tor with a compiler that + does not support expanding statitically initialized const values in + macro's. Fixes bug 40410; bugfix on 0.4.6.5. diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c index 30b47232ca..cc6c5e04f4 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -1959,8 +1959,7 @@ dir_client_decompress_response_body(char **bodyp, size_t *bodylenp, /* If we're pretty sure that we have a compressed directory, and * we didn't manage to uncompress it, then warn and bail. */ if (!plausible && !new_body) { - const int LOG_INTERVAL = 3600; - static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL); + static ratelim_t warning_limit = RATELIM_INIT(60 * 60); log_fn_ratelim(&warning_limit, LOG_WARN, LD_HTTP, "Unable to decompress HTTP body (tried %s%s%s, on %s).", description1, |