Update some inclusions of <openssl/macros.h>
authorRichard Levitte <levitte@openssl.org>
Tue, 5 Nov 2019 16:36:44 +0000 (17:36 +0100)
committerRichard Levitte <levitte@openssl.org>
Thu, 7 Nov 2019 10:37:25 +0000 (11:37 +0100)
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10364)

include/openssl/opensslv.h.in
ssl/methods.c

index 69ba8c6..9380504 100644 (file)
 # 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 */
index 6118fdb..525f59e 100644 (file)
@@ -8,6 +8,7 @@
  */
 
 #include <stdio.h>
+#include <openssl/macros.h>
 #include <openssl/objects.h>
 #include "ssl_local.h"