[tor-commits] [tor/master] Silence unused-const-variable warnings in zstd.h on some gcc versions

[nickm at torproject.org]

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8
Author: teor <teor2345 at gmail.com>
Date:   Sat Jun 2 14:08:01 2018 -0700

    Silence unused-const-variable warnings in zstd.h on some gcc versions
    
    Fixes bug 26272; bugfix on 0.3.1.1-alpha.
---
 changes/bug26272           | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/changes/bug26272 b/changes/bug26272
new file mode 100644
index 000000000..9dcf42f0e
--- /dev/null
+++ 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
index 63e92ed22..11edfffa0 100644
--- 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. */