diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-30 08:17:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-30 08:17:24 -0400 |
| commit | 15d7f24c57828b94596ccfd97081840b920c2336 (patch) | |
| tree | 044c018871e0abfc7a061ea31ca73c0372b8ccc0 /src/common | |
| parent | dbf57ecf39e3066b567c5aade9e8b5575e1e1ec0 (diff) | |
| parent | a8bdb851eb23b6067e24ad955bb8f499b8348b95 (diff) | |
| download | tor-15d7f24c57828b94596ccfd97081840b920c2336.tar.gz tor-15d7f24c57828b94596ccfd97081840b920c2336.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compress_zstd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c index 193a0289f0..b9f9f1f076 100644 --- a/src/common/compress_zstd.c +++ b/src/common/compress_zstd.c @@ -19,10 +19,14 @@ #include "compress_zstd.h" #ifdef HAVE_ZSTD +#ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE DISABLE_GCC_WARNING(unused-const-variable) +#endif #include <zstd.h> +#ifdef HAVE_CFLAG_WUNUSED_CONST_VARIABLE ENABLE_GCC_WARNING(unused-const-variable) #endif +#endif /** Total number of bytes allocated for Zstandard state. */ static atomic_counter_t total_zstd_allocation; |