Don't disable an unsupported compiler warning

Conditionalize the pragma that temporarily disables
-Wunused-const-variable.  Some versions of gcc don't support it.  We
need to do this because of an apparent bug in some libzstd headers.
Fixes bug 26785; bugfix on 0.3.2.11.
This commit is contained in:
Taylor Yu 2018-07-26 12:32:34 -05:00
parent be3a962ca7
commit a8bdb851eb
3 changed files with 11 additions and 0 deletions

4
changes/bug26785 Normal file
View File

@ -0,0 +1,4 @@
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.

View File

@ -2143,6 +2143,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

View File

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