From 4431107d6c430950c2c2e19c03b8dff6355ccfdb Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 10 Jul 2018 19:11:06 +0200 Subject: [PATCH] Guard DECLARE_DEPRECATED against multiple includes of opensslconf.h Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/6689) --- include/openssl/opensslconf.h.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index 200a11a8fa..b793d482c7 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -68,11 +68,13 @@ extern "C" { * still won't see them if the library has been built to disable deprecated * functions. */ -#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)); +#ifndef DECLARE_DEPRECATED +# 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 #endif