summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2023-01-26 15:19:40 +0000
committerHugo Landau <hlandau@openssl.org>2023-02-22 05:34:05 +0000
commitd6cf4b59a0f3c32d61828ee82c193494e13ff969 (patch)
tree704670aa3b41ba3dca1a8ed56546e9a417908198 /ssl
parent533390e46f8e2ea55d66d35fd54e724c2fb77571 (diff)
Don't declare SSL_CONNECTION twice
It causes problems with some compilation options Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/20030)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/record/record.h2
-rw-r--r--ssl/ssl_local.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/ssl/record/record.h b/ssl/record/record.h
index cd2b78698d..8113d78da0 100644
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -7,8 +7,6 @@
* https://www.openssl.org/source/license.html
*/
-typedef struct ssl_connection_st SSL_CONNECTION;
-
#include <openssl/core_dispatch.h>
#include "internal/recordmethod.h"
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index f28f4419ef..e82564daf6 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -27,7 +27,6 @@
# include <openssl/async.h>
# include <openssl/symhacks.h>
# include <openssl/ct.h>
-# include "record/record.h"
# include "internal/recordmethod.h"
# include "internal/statem.h"
# include "internal/packet.h"
@@ -37,6 +36,7 @@
# include "internal/bio.h"
# include "internal/ktls.h"
# include "internal/time.h"
+# include "record/record.h"
# ifdef OPENSSL_BUILD_SHLIBSSL
# undef OPENSSL_EXTERN