nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.1' into maint-0.3.2

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-12 08:18:56 -04:00
commit 5d8a927aa3
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug26272 Normal file
View File

@ -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.

2
src/common/compress_zstd.c
View File

@ -19,7 +19,9 @@
#include "compress_zstd.h" #include "compress_zstd.h"
#ifdef HAVE_ZSTD #ifdef HAVE_ZSTD
DISABLE_GCC_WARNING(unused-const-variable)
#include <zstd.h> #include <zstd.h>
ENABLE_GCC_WARNING(unused-const-variable)
#endif #endif
/** Total number of bytes allocated for Zstandard state. */ /** Total number of bytes allocated for Zstandard state. */