From e3bc1305ec97d4ad4ab05fa59a288e92df2b2025 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 11 Jan 2017 10:35:15 +0000 Subject: Fix compilation with no-nextprotoneg A guard was in the wrong place in the header file. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2212) --- ssl/ssl_locl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 1bff6ada41..10ae54c5b6 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -807,7 +807,6 @@ struct ssl_ctx_st { unsigned char *supportedgroups; # endif /* OPENSSL_NO_EC */ -# ifndef OPENSSL_NO_NEXTPROTONEG /* * ALPN information (we are in the process of transitioning from NPN to * ALPN.) @@ -837,6 +836,7 @@ struct ssl_ctx_st { unsigned char *alpn; size_t alpn_len; +# ifndef OPENSSL_NO_NEXTPROTONEG /* Next protocol negotiation information */ /* -- cgit v1.2.3