Fix no-dtls builds

Commits f2ff1432f in master and 14d4d7eda in 1.1.0 broke the no-dtls build
by moving the position of a "#endif" for OPENSSL_NO_DTLS in a change
which is otherwise unrelated to DTLS. This puts it back to where it was.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2974)
This commit is contained in:
Matt Caswell 2017-03-17 10:21:25 +00:00
parent 3fb2c3e452
commit 9998b32cb6
1 changed files with 6 additions and 1 deletions

View File

@ -138,9 +138,14 @@ static const char *session_id_prefix = NULL;
#ifndef OPENSSL_NO_DTLS
static int enable_timeouts = 0;
static long socket_mtu;
static int dtlslisten = 0;
#endif
/*
* We define this but make it always be 0 in no-dtls builds to simplify the
* code.
*/
static int dtlslisten = 0;
static int early_data = 0;
#ifndef OPENSSL_NO_PSK