diff options
| author | Flavio Medeiros <flaviomotamedeiros@gmail.com> | 2016-01-30 20:14:39 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-24 16:11:39 -0500 |
| commit | b5292f7b40fd5da1feff4d5394f84c629c97eda4 (patch) | |
| tree | 0b1755c1833784c9df78809fba9ce1e06d5df68a /crypto/bio | |
| parent | f7c798e34b50d3cc09629537153bb60ae9ea85fc (diff) | |
| download | openssl-b5292f7b40fd5da1feff4d5394f84c629c97eda4.tar.gz | |
GH480: Don't break statements with CPP stuff.
This is also RT 4137
Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/bss_dgram.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index 0887293e29..36d40755fb 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -458,6 +458,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) int *ip; bio_dgram_data *data = NULL; int sockopt_val = 0; + int d_errno; # if defined(OPENSSL_SYS_LINUX) && (defined(IP_MTU_DISCOVER) || defined(IP_MTU)) socklen_t sockopt_len; /* assume that system supporting IP_MTU is * modern enough to define socklen_t */ @@ -760,11 +761,11 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) /* fall-through */ case BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP: # ifdef OPENSSL_SYS_WINDOWS - if (data->_errno == WSAETIMEDOUT) + d_errno = (data->_errno == WSAETIMEDOUT); # else - if (data->_errno == EAGAIN) + d_errno = (data->_errno == EAGAIN); # endif - { + if (d_errno) { ret = 1; data->_errno = 0; } else |