sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Suppress the Wredundant-decls warning in another set of openssl headers

This commit is contained in:
Nick Mathewson 2016-06-14 12:17:02 -04:00
parent b217e4ac65
commit 71aacbe427
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/tools/tor-gencert.c
View File

@ -13,6 +13,20 @@
#include <unistd.h>
#endif
#ifdef __GNUC__
#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#endif
#if __GNUC__ && GCC_VERSION >= 402
#if GCC_VERSION >= 406
#pragma GCC diagnostic push
#endif
/* 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. */
#pragma GCC diagnostic ignored "-Wredundant-decls"
#endif
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
@ -20,6 +34,14 @@
#include <openssl/obj_mac.h>
#include <openssl/err.h>
#if __GNUC__ && GCC_VERSION >= 402
#if GCC_VERSION >= 406
#pragma GCC diagnostic pop
#else
#pragma GCC diagnostic warning "-Wredundant-decls"
#endif
#endif
#include <errno.h>
#if 0
#include <stdlib.h>