diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-07-10 19:11:06 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-07-10 19:11:06 +0200 |
| commit | 4431107d6c430950c2c2e19c03b8dff6355ccfdb (patch) | |
| tree | 4adab44679d5c3640e97e088b04c79f4acc88133 | |
| parent | 4e351ca92e3a1f447cef3d2e330f13941f9412c6 (diff) | |
| download | openssl-4431107d6c430950c2c2e19c03b8dff6355ccfdb.zip openssl-4431107d6c430950c2c2e19c03b8dff6355ccfdb.tar.gz openssl-4431107d6c430950c2c2e19c03b8dff6355ccfdb.tar.bz2 | |
Guard DECLARE_DEPRECATED against multiple includes of opensslconf.h
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6689)
| -rw-r--r-- | include/openssl/opensslconf.h.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index 200a11a..b793d48 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 |