Merge branch 'maint-0.3.3' into maint-0.3.4

This commit is contained in:
Nick Mathewson
2018-07-30 08:17:25 -04:00
3 changed files with 11 additions and 0 deletions
+4
View File
@@ -26,10 +26,14 @@
#endif
#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;