aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-12 08:18:57 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-12 08:18:57 -0400
commit6230dfaf14bb6b92a5afaa8e81d00da4f0805955 (patch)
treed9f2477f38fa873deae9e09e2e355fca2397a9b7 /src
parentf4e51990b911161b26138f40f3d370eeafd9ac2f (diff)
parent7fff99110b6d00dbd438ce9182474f045f996f3f (diff)
downloadtor-6230dfaf14bb6b92a5afaa8e81d00da4f0805955.tar.gz
tor-6230dfaf14bb6b92a5afaa8e81d00da4f0805955.zip
Merge branch 'maint-0.3.3'
Diffstat (limited to 'src')
-rw-r--r--src/common/compress_zstd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 4024f5594d..316a3fb417 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -26,7 +26,9 @@
#endif
#ifdef HAVE_ZSTD
+DISABLE_GCC_WARNING(unused-const-variable)
#include <zstd.h>
+ENABLE_GCC_WARNING(unused-const-variable)
#endif
/** Total number of bytes allocated for Zstandard state. */