diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-11-05 17:36:44 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-11-07 11:37:25 +0100 |
| commit | 285a0db396ff3a7801c199b6d812eae298178249 (patch) | |
| tree | 65a4bdeca6b6ebce668323fb50e339f9b9328844 | |
| parent | 9fd9951e4b49051c8f69157b478070951c43c5c4 (diff) | |
Update some inclusions of <openssl/macros.h>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10364)
| -rw-r--r-- | include/openssl/opensslv.h.in | 11 | ||||
| -rw-r--r-- | ssl/methods.c | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/openssl/opensslv.h.in b/include/openssl/opensslv.h.in index 69ba8c657a..9380504721 100644 --- a/include/openssl/opensslv.h.in +++ b/include/openssl/opensslv.h.in @@ -13,11 +13,6 @@ # define OPENSSL_OPENSSLV_H # pragma once -# include <openssl/macros.h> -# if !OPENSSL_API_3 -# define HEADER_OPENSSLV_H -# endif - # ifdef __cplusplus extern "C" { # endif @@ -138,4 +133,10 @@ _____ # ifdef __cplusplus } # endif + +# include <openssl/macros.h> +# ifndef OPENSSL_NO_DEPRECATED_3_0 +# define HEADER_OPENSSLV_H +# endif + #endif /* OPENSSL_OPENSSLV_H */ diff --git a/ssl/methods.c b/ssl/methods.c index 6118fdbaae..525f59e912 100644 --- a/ssl/methods.c +++ b/ssl/methods.c @@ -8,6 +8,7 @@ */ #include <stdio.h> +#include <openssl/macros.h> #include <openssl/objects.h> #include "ssl_local.h" |