Merge branch 'pre_formatter_cleanups_squashed'

This commit is contained in:
Nick Mathewson
2020-01-09 07:32:39 -05:00
59 changed files with 284 additions and 206 deletions
+2 -2
View File
@@ -21,7 +21,7 @@
/* Some versions of OpenSSL declare X509_STORE_CTX_set_verify_cb twice in
* x509.h and x509_vfy.h. Suppress the GCC warning so we can build with
* -Wredundant-decl. */
DISABLE_GCC_WARNING(redundant-decls)
DISABLE_GCC_WARNING("-Wredundant-decls")
#include <openssl/evp.h>
#include <openssl/pem.h>
@@ -30,7 +30,7 @@ DISABLE_GCC_WARNING(redundant-decls)
#include <openssl/obj_mac.h>
#include <openssl/err.h>
ENABLE_GCC_WARNING(redundant-decls)
ENABLE_GCC_WARNING("-Wredundant-decls")
#endif /* defined(ENABLE_OPENSSL) */
#include <errno.h>