From 3550d9159f0c89b2ae1c01e81e31649d1b357d06 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 9 Jul 2018 17:31:23 +0200 Subject: [PATCH] Avoid __GNUC__ warnings when defining DECLARE_DEPRECATED We need to check that __GNUC__ is defined before trying to use it. This demands a slightly different way to define DECLARE_DEPRECATED. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/6680) --- include/openssl/opensslconf.h.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index 96f791ec6c..200a11a8fa 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -68,10 +68,12 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); -#else -# define DECLARE_DEPRECATED(f) f; +#define DECLARE_DEPRECATED(f) f; +#ifdef __GNUC__ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif #endif #ifndef OPENSSL_FILE -- 2.34.1