From: Vladimir Kotal <vladimir.kotal@oracle.com>
Date: Mon, 12 Aug 2019 12:02:52 +0000 (+0200)
Subject: enable DECLARE_DEPRECATED macro for Oracle Developer Studio compiler
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8354f53d40781630eb4caa1a2ce31eca5296aa29;p=oweals%2Fopenssl.git

enable DECLARE_DEPRECATED macro for Oracle Developer Studio compiler

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9575)
---

diff --git a/CHANGES b/CHANGES
index 228408d9f0..8b2fd3f8bd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@
 
  Changes between 1.1.1g and 1.1.1h [xx XXX xxxx]
 
-  *)
+  *) The Oracle Developer Studio compiler will start reporting deprecated APIs
 
  Changes between 1.1.1f and 1.1.1g [21 Apr 2020]
 
diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index bc98cad51a..ee40809aed 100644
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -77,6 +77,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
 #  endif
+# elif defined(__SUNPRO_C)
+#  if (__SUNPRO_C >= 0x5130)
+#   undef DECLARE_DEPRECATED
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#  endif
 # endif
 #endif