projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix OpenSSLUtils to not include headers the wrong way
[folly.git]
/
folly
/
io
/
async
/
ssl
/
OpenSSLUtils.cpp
diff --git
a/folly/io/async/ssl/OpenSSLUtils.cpp
b/folly/io/async/ssl/OpenSSLUtils.cpp
index c7a0346e6634390bfca5dd9f55a36d946e730bc2..80d90ec04c92e409dbd618cf5618f0b4cf711bc0 100644
(file)
--- a/
folly/io/async/ssl/OpenSSLUtils.cpp
+++ b/
folly/io/async/ssl/OpenSSLUtils.cpp
@@
-22,6
+22,7
@@
#include <folly/ScopeGuard.h>
#include <folly/portability/Sockets.h>
#include <folly/ScopeGuard.h>
#include <folly/portability/Sockets.h>
+#include <folly/portability/Unistd.h>
namespace {
#ifdef OPENSSL_IS_BORINGSSL
namespace {
#ifdef OPENSSL_IS_BORINGSSL
@@
-346,11
+347,6
@@
static int boringssl_bio_fd_non_fatal_error(int err) {
#if defined(OPENSSL_WINDOWS)
#if defined(OPENSSL_WINDOWS)
-#include <io.h>
-#pragma warning(push, 3)
-#include <windows.h>
-#pragma warning(pop)
-
int boringssl_bio_fd_should_retry(int i) {
if (i == -1) {
return boringssl_bio_fd_non_fatal_error((int)GetLastError());
int boringssl_bio_fd_should_retry(int i) {
if (i == -1) {
return boringssl_bio_fd_non_fatal_error((int)GetLastError());
@@
-360,7
+356,6
@@
int boringssl_bio_fd_should_retry(int i) {
#else // !OPENSSL_WINDOWS
#else // !OPENSSL_WINDOWS
-#include <unistd.h>
int boringssl_bio_fd_should_retry(int i) {
if (i == -1) {
return boringssl_bio_fd_non_fatal_error(errno);
int boringssl_bio_fd_should_retry(int i) {
if (i == -1) {
return boringssl_bio_fd_non_fatal_error(errno);