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
This commit is contained in:
Alexander Færøy 2021-06-10 20:04:13 +00:00 committed by David Goulet
parent 7c4fd150cd
commit 31fa3cc1a0
2 changed files with 5 additions and 2 deletions

4
changes/ticket40410 Normal file
View File

@ -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.

View File

@ -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 /* If we're pretty sure that we have a compressed directory, and
* we didn't manage to uncompress it, then warn and bail. */ * we didn't manage to uncompress it, then warn and bail. */
if (!plausible && !new_body) { if (!plausible && !new_body) {
const int LOG_INTERVAL = 3600; static ratelim_t warning_limit = RATELIM_INIT(60 * 60);
static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL);
log_fn_ratelim(&warning_limit, LOG_WARN, LD_HTTP, log_fn_ratelim(&warning_limit, LOG_WARN, LD_HTTP,
"Unable to decompress HTTP body (tried %s%s%s, on %s).", "Unable to decompress HTTP body (tried %s%s%s, on %s).",
description1, description1,