From 285a0db396ff3a7801c199b6d812eae298178249 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 5 Nov 2019 17:36:44 +0100
Subject: [PATCH] Update some inclusions of <openssl/macros.h>

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10364)
---
 include/openssl/opensslv.h.in | 11 ++++++-----
 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"
 
-- 
2.25.1