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

use new-form macros to disable -Wredundant-decls

This commit is contained in:
Nick Mathewson 2016-06-14 12:22:52 -04:00
parent df4fa92a88
commit 3bffdf05d1
2 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/test/test_tortls.c
View File

@ -10,18 +10,12 @@
#endif
#include <math.h>
#ifdef __GNUC__
#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#endif
#include "compat.h"
#if __GNUC__ && GCC_VERSION >= 402
#if GCC_VERSION >= 406
#pragma GCC diagnostic push
#endif
/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
* srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */
#pragma GCC diagnostic ignored "-Wredundant-decls"
#endif
DISABLE_GCC_WARNING(redundant-decls)
#include <openssl/opensslv.h>
@ -34,13 +28,7 @@
#include <openssl/evp.h>
#include <openssl/bn.h>
#if __GNUC__ && GCC_VERSION >= 402
#if GCC_VERSION >= 406
#pragma GCC diagnostic pop
#else
#pragma GCC diagnostic warning "-Wredundant-decls"
#endif
#endif
ENABLE_GCC_WARNING(redundant-decls)
#include "or.h"
#include "torlog.h"

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

@ -13,19 +13,12 @@
#include <unistd.h>
#endif
#ifdef __GNUC__
#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#endif
#include "compat.h"
#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
DISABLE_GCC_WARNING(redundant-decls)
#include <openssl/evp.h>
#include <openssl/pem.h>
@ -34,13 +27,7 @@
#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
ENABLE_GCC_WARNING(redundant-decls)
#include <errno.h>
#if 0