diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-12 08:18:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-12 08:18:56 -0400 |
| commit | 5d8a927aa35c01c59dcf137827db27b92d034498 (patch) | |
| tree | e32fd42a264ba661cc500127994764a7c2e040ba | |
| parent | 74ac463e7fb806e5abf48be788daf03c40e930ad (diff) | |
| parent | d84581a3e677a6905125b619c590488c12a36ae8 (diff) | |
| download | tor-5d8a927aa35c01c59dcf137827db27b92d034498.tar.gz tor-5d8a927aa35c01c59dcf137827db27b92d034498.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
| -rw-r--r-- | changes/bug26272 | 3 | ||||
| -rw-r--r-- | src/common/compress_zstd.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug26272 b/changes/bug26272 new file mode 100644 index 0000000000..9dcf42f0e1 --- /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 c1cdaf17ad..baa7749f0a 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. */ |