tor

commit 7fff99110b6d00dbd438ce9182474f045f996f3f
parent 6dca180ae9abcd5bd12c6aa4dda8d3e19017a6cb
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 12 Jun 2018 08:18:56 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

Diffstat:
A
changes/bug26272
 | 
3
+++
M
src/common/compress_zstd.c
 | 
2
++

2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/changes/bug26272 b/changes/bug26272
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+    - Silence unused-const-variable warnings in zstd.h on some gcc versions.
+      Fixes bug 26272; bugfix on 0.3.1.1-alpha.
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
@@ -19,7 +19,9 @@
 #include "compress_zstd.h"
 
 #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. */