Commit 15d7f24c authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.2' into maint-0.3.3

parents dbf57ecf a8bdb851

changes/bug26785

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (compilation, portability):

    - Don't try to use a pragma to temporarily disable

      -Wunused-const-variable if the compiler doesn't support it.

      Fixes bug 26785; bugfix on 0.3.2.11.

configure.ac

+3 −0
Original line number Diff line number Diff line
@@ -2172,6 +2172,9 @@ dnl -Wthread-safety-precise 
  if test "$tor_cv_cflags__Woverlength_strings" = "yes"; then

    AC_DEFINE([HAVE_CFLAG_WOVERLENGTH_STRINGS], 1, [True if we have -Woverlength-strings])

  fi

  if test "$tor_cv_cflags__warn_unused_const_variable_2" = "yes"; then

    AC_DEFINE([HAVE_CFLAG_WUNUSED_CONST_VARIABLE], 1, [True if we have -Wunused-const-variable])

  fi



  if test "x$enable_fatal_warnings" = "xyes"; then

    # I'd like to use TOR_CHECK_CFLAGS here, but I can't, since the

src/common/compress_zstd.c

+4 −0
Original line number Diff line number Diff line
@@ -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;