projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make OCSP_id_cmp and OCSP_id_issuer_cmp accept const params
[oweals/openssl.git]
/
include
/
openssl
/
opensslconf.h.in
diff --git
a/include/openssl/opensslconf.h.in
b/include/openssl/opensslconf.h.in
index 96f791ec6cc2d573dba905f518aea79eba39fe96..bc98cad51a64c23de1d81d932c2839dbe491072e 100644
(file)
--- a/
include/openssl/opensslconf.h.in
+++ b/
include/openssl/opensslconf.h.in
@@
-9,6
+9,8
@@
* https://www.openssl.org/source/license.html
*/
* https://www.openssl.org/source/license.html
*/
+#include <openssl/opensslv.h>
+
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
@@
-68,10
+70,14
@@
extern "C" {
* still won't see them if the library has been built to disable deprecated
* functions.
*/
* 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
+#ifndef DECLARE_DEPRECATED
# 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
#endif
#ifndef OPENSSL_FILE
#endif
#ifndef OPENSSL_FILE
@@
-93,7
+99,13
@@
extern "C" {
# define OPENSSL_API_COMPAT OPENSSL_MIN_API
#endif
# define OPENSSL_API_COMPAT OPENSSL_MIN_API
#endif
-#if OPENSSL_API_COMPAT < 0x10200000L
+/*
+ * Do not deprecate things to be deprecated in version 1.2.0 before the
+ * OpenSSL version number matches.
+ */
+#if OPENSSL_VERSION_NUMBER < 0x10200000L
+# define DEPRECATEDIN_1_2_0(f) f;
+#elif OPENSSL_API_COMPAT < 0x10200000L
# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f)
#else
# define DEPRECATEDIN_1_2_0(f)
# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f)
#else
# define DEPRECATEDIN_1_2_0(f)