Explorar o código

Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

Nick Mathewson %!s(int64=6) %!d(string=hai) anos
pai
achega
d84581a3e6
Modificáronse 2 ficheiros con 5 adicións e 0 borrados
  1. 3 0
      changes/bug26272
  2. 2 0
      src/common/compress_zstd.c

+ 3 - 0
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.

+ 2 - 0
src/common/compress_zstd.c

@@ -19,7 +19,9 @@
 #include "compress_zstd.h"
 
 #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. */