Commit 1b0c0d91 authored by Christopher Dykes's avatar Christopher Dykes Committed by Facebook Github Bot

Fix OpenSSLUtils to not include headers the wrong way

Summary: This is entirely the wrong way to include these headers, and is being included within an anon namespace so just wrong.

Reviewed By: yfeldblum

Differential Revision: D5215065

fbshipit-source-id: 499df58c0202f7a1d4482eaa6a0e8b2e1535c763
parent f34d96eb
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <folly/ScopeGuard.h> #include <folly/ScopeGuard.h>
#include <folly/portability/Sockets.h> #include <folly/portability/Sockets.h>
#include <folly/portability/Unistd.h>
namespace { namespace {
#ifdef OPENSSL_IS_BORINGSSL #ifdef OPENSSL_IS_BORINGSSL
...@@ -346,11 +347,6 @@ static int boringssl_bio_fd_non_fatal_error(int err) { ...@@ -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) { int boringssl_bio_fd_should_retry(int i) {
if (i == -1) { if (i == -1) {
return boringssl_bio_fd_non_fatal_error((int)GetLastError()); return boringssl_bio_fd_non_fatal_error((int)GetLastError());
...@@ -360,7 +356,6 @@ int boringssl_bio_fd_should_retry(int i) { ...@@ -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) { int boringssl_bio_fd_should_retry(int i) {
if (i == -1) { if (i == -1) {
return boringssl_bio_fd_non_fatal_error(errno); return boringssl_bio_fd_non_fatal_error(errno);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment