diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-12 08:18:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-12 08:18:57 -0400 |
| commit | 6230dfaf14bb6b92a5afaa8e81d00da4f0805955 (patch) | |
| tree | d9f2477f38fa873deae9e09e2e355fca2397a9b7 | |
| parent | f4e51990b911161b26138f40f3d370eeafd9ac2f (diff) | |
| parent | 7fff99110b6d00dbd438ce9182474f045f996f3f (diff) | |
| download | tor-6230dfaf14bb6b92a5afaa8e81d00da4f0805955.tar.gz tor-6230dfaf14bb6b92a5afaa8e81d00da4f0805955.zip | |
Merge branch 'maint-0.3.3'
| -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 4024f5594d..316a3fb417 100644 --- 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. */ |