diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-14 20:21:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-14 20:21:02 -0400 |
| commit | 227d3b3d6b0955fe4f0cf1d2081b2ce9649de248 (patch) | |
| tree | 030fc399668b985ecd9c76d305c3b83121f83139 /src/test/test_microdesc.c | |
| parent | 8486dea8d7f2d363c4d0d3d093319caa5c728f4e (diff) | |
| download | tor-227d3b3d6b0955fe4f0cf1d2081b2ce9649de248.tar.gz tor-227d3b3d6b0955fe4f0cf1d2081b2ce9649de248.zip | |
Use ENABLE/DISABLE_GCC_WARNING in masater.
Diffstat (limited to 'src/test/test_microdesc.c')
| -rw-r--r-- | src/test/test_microdesc.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 89ada96315..be90f53196 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -14,30 +14,11 @@ #include "test.h" -#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. - * 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/rsa.h> #include <openssl/bn.h> #include <openssl/pem.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) #ifdef _WIN32 /* For mkdir() */ |