commit 3bffdf05d1d84427b48b783178d2115b030ca7b9 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 14 12:22:52 2016 -0400

use new-form macros to disable -Wredundant-decls --- src/test/test_tortls.c | 20 ++++---------------- 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 52be7d4..f8fd7af 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 8e9aadc..4ddfbc9 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