tor

commit 6230dfaf14bb6b92a5afaa8e81d00da4f0805955
parent f4e51990b911161b26138f40f3d370eeafd9ac2f
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 12 Jun 2018 08:18:57 -0400

Merge branch '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
@@ -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. */