diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-14 12:22:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-14 12:22:52 -0400 |
| commit | 3bffdf05d1d84427b48b783178d2115b030ca7b9 (patch) | |
| tree | 1372592ad6e8d44be053a71c520b9f05309c3e80 /src | |
| parent | df4fa92a88dbeadcc85ea28ac52af006e9e1466a (diff) | |
| download | tor-3bffdf05d1d84427b48b783178d2115b030ca7b9.tar.gz tor-3bffdf05d1d84427b48b783178d2115b030ca7b9.zip | |
use new-form macros to disable -Wredundant-decls
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/test_tortls.c | 20 | ||||
| -rw-r--r-- | src/tools/tor-gencert.c | 19 |
2 files changed, 7 insertions, 32 deletions
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 52be7d4e3a..f8fd7affe6 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -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" diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index 8e9aadcb18..4ddfbc9657 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -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 |