[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  3550d9159f0c89b2ae1c01e81e31649d1b357d06 (commit)
      from  8977880603176bea3dda1f1accae1b774d2104ac (commit)


- Log -----------------------------------------------------------------
commit 3550d9159f0c89b2ae1c01e81e31649d1b357d06
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jul 9 17:31:23 2018 +0200

    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 <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6680)

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

Summary of changes:
 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 96f791e..200a11a 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