root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Matt Caswell 2023-01-26 15:19:40 +00:00 committed by Hugo Landau
parent 533390e46f
commit d6cf4b59a0
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/record/record.h
View File

@ -7,8 +7,6 @@
* https://www.openssl.org/source/license.html * https://www.openssl.org/source/license.html
*/ */
typedef struct ssl_connection_st SSL_CONNECTION;
#include <openssl/core_dispatch.h> #include <openssl/core_dispatch.h>
#include "internal/recordmethod.h" #include "internal/recordmethod.h"

2
ssl/ssl_local.h
View File

@ -27,7 +27,6 @@
# include <openssl/async.h> # include <openssl/async.h>
# include <openssl/symhacks.h> # include <openssl/symhacks.h>
# include <openssl/ct.h> # include <openssl/ct.h>
# include "record/record.h"
# include "internal/recordmethod.h" # include "internal/recordmethod.h"
# include "internal/statem.h" # include "internal/statem.h"
# include "internal/packet.h" # include "internal/packet.h"
@ -37,6 +36,7 @@
# include "internal/bio.h" # include "internal/bio.h"
# include "internal/ktls.h" # include "internal/ktls.h"
# include "internal/time.h" # include "internal/time.h"
# include "record/record.h"
# ifdef OPENSSL_BUILD_SHLIBSSL # ifdef OPENSSL_BUILD_SHLIBSSL
# undef OPENSSL_EXTERN # undef OPENSSL_EXTERN