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 | 7fff99110b6d00dbd438ce9182474f045f996f3f (patch) | |
| tree | e3eda976d82a6d78b7ccf2cc13922cef2a566815 /src | |
| parent | 6dca180ae9abcd5bd12c6aa4dda8d3e19017a6cb (diff) | |
| parent | 5d8a927aa35c01c59dcf137827db27b92d034498 (diff) | |
| download | tor-7fff99110b6d00dbd438ce9182474f045f996f3f.tar.gz tor-7fff99110b6d00dbd438ce9182474f045f996f3f.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compress_zstd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index 0db87d61b7..193a0289f0 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. */ |