[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4431107d6c430950c2c2e19c03b8dff6355ccfdb (commit)
      from  4e351ca92e3a1f447cef3d2e330f13941f9412c6 (commit)


- Log -----------------------------------------------------------------
commit 4431107d6c430950c2c2e19c03b8dff6355ccfdb
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 10 19:11:06 2018 +0200

    Guard DECLARE_DEPRECATED against multiple includes of opensslconf.h
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6689)

-----------------------------------------------------------------------

Summary of changes:
 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 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