aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-30 08:17:25 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-30 08:17:25 -0400
commitd102e9c2e4ab5dfca0c03f7b4e27431d069338fd (patch)
treecb53b11465d2d78cd8510dcf3096bad8bfba32c2 /src/common
parent977821e59fb6e57639a842f498be32633bb0b0e1 (diff)
parent15d7f24c57828b94596ccfd97081840b920c2336 (diff)
downloadtor-d102e9c2e4ab5dfca0c03f7b4e27431d069338fd.tar.gz
tor-d102e9c2e4ab5dfca0c03f7b4e27431d069338fd.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src/common')
-rw-r--r--src/common/compress_zstd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 316a3fb417..dc8b4d621d 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -26,10 +26,14 @@
#endif
#ifdef HAVE_ZSTD
+#ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE
DISABLE_GCC_WARNING(unused-const-variable)
+#endif
#include <zstd.h>
+#ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE
ENABLE_GCC_WARNING(unused-const-variable)
#endif
+#endif
/** Total number of bytes allocated for Zstandard state. */
static atomic_counter_t total_zstd_allocation;