From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 30 Jul 2018 12:17:25 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.6-rc~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d102e9c2e4ab5dfca0c03f7b4e27431d069338fd;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4
---

d102e9c2e4ab5dfca0c03f7b4e27431d069338fd
diff --cc src/common/compress_zstd.c
index 316a3fb417,b9f9f1f076..dc8b4d621d
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@@ -18,18 -18,15 +18,22 @@@
  #include "compress.h"
  #include "compress_zstd.h"
  
 +#ifdef ENABLE_ZSTD_ADVANCED_APIS
 +/* This is a lie, but we make sure it doesn't get us in trouble by wrapping
 + * all invocations of zstd's static-only functions in a check to make sure
 + * that the compile-time version matches the run-time version. */
 +#define ZSTD_STATIC_LINKING_ONLY
 +#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;