提交 d88ab353 编写于 作者: R Richard Levitte

Correct some badly formated preprocessor lines

Reviewed-by: NMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3304)
上级 a5eef31e
...@@ -2125,11 +2125,11 @@ static int sv_body(int s, int stype, int prot, unsigned char *context) ...@@ -2125,11 +2125,11 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
struct timeval *timeoutp; struct timeval *timeoutp;
#endif #endif
#ifndef OPENSSL_NO_DTLS #ifndef OPENSSL_NO_DTLS
#ifndef OPENSSL_NO_SCTP # ifndef OPENSSL_NO_SCTP
int isdtls = (stype == SOCK_DGRAM || prot == IPPROTO_SCTP); int isdtls = (stype == SOCK_DGRAM || prot == IPPROTO_SCTP);
#else # else
int isdtls = (stype == SOCK_DGRAM); int isdtls = (stype == SOCK_DGRAM);
#endif # endif
#endif #endif
buf = app_malloc(bufsize, "server buffer"); buf = app_malloc(bufsize, "server buffer");
...@@ -2163,11 +2163,11 @@ static int sv_body(int s, int stype, int prot, unsigned char *context) ...@@ -2163,11 +2163,11 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
} }
#ifndef OPENSSL_NO_DTLS #ifndef OPENSSL_NO_DTLS
if (isdtls) { if (isdtls) {
#ifndef OPENSSL_NO_SCTP # ifndef OPENSSL_NO_SCTP
if (prot == IPPROTO_SCTP) if (prot == IPPROTO_SCTP)
sbio = BIO_new_dgram_sctp(s, BIO_NOCLOSE); sbio = BIO_new_dgram_sctp(s, BIO_NOCLOSE);
else else
#endif # endif
sbio = BIO_new_dgram(s, BIO_NOCLOSE); sbio = BIO_new_dgram(s, BIO_NOCLOSE);
if (enable_timeouts) { if (enable_timeouts) {
......
...@@ -474,7 +474,7 @@ static SRP_user_pwd *find_user(SRP_VBASE *vb, char *username) ...@@ -474,7 +474,7 @@ static SRP_user_pwd *find_user(SRP_VBASE *vb, char *username)
return NULL; return NULL;
} }
#if OPENSSL_API_COMPAT < 0x10100000L # if OPENSSL_API_COMPAT < 0x10100000L
/* /*
* DEPRECATED: use SRP_VBASE_get1_by_user instead. * DEPRECATED: use SRP_VBASE_get1_by_user instead.
* This method ignores the configured seed and fails for an unknown user. * This method ignores the configured seed and fails for an unknown user.
...@@ -485,7 +485,7 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username) ...@@ -485,7 +485,7 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)
{ {
return find_user(vb, username); return find_user(vb, username);
} }
#endif # endif
/* /*
* Ownership of the returned pointer is released to the caller. * Ownership of the returned pointer is released to the caller.
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/conf.h> #include <openssl/conf.h>
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h> # include <openssl/engine.h>
#endif #endif
#include "e_os.h" #include "e_os.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册