Merge branch 'maint-0.4.2' into maint-0.4.3

This commit is contained in:
Nick Mathewson 2020-05-15 10:25:27 -04:00
commit bcaf480aee

View File

@ -439,7 +439,7 @@ AC_CACHE_CHECK([for __attribute__((fallthrough))],
[tor_cv_c_attr_fallthrough=no] )]) [tor_cv_c_attr_fallthrough=no] )])
CFLAGS="$saved_CFLAGS" CFLAGS="$saved_CFLAGS"
if test "$tor_cv_c_attr_fallthrough" == "yes"; then if test "$tor_cv_c_attr_fallthrough" = "yes"; then
AC_DEFINE(HAVE_ATTR_FALLTHROUGH, [1], [defined if we have the fallthrough attribute.]) AC_DEFINE(HAVE_ATTR_FALLTHROUGH, [1], [defined if we have the fallthrough attribute.])
fi fi