From: Christopher Dykes <cdykes@fb.com>
Date: Tue, 24 Jan 2017 21:28:28 +0000 (-0800)
Subject: Ensure portability/Windows.h is included before OpenSSL headers
X-Git-Tag: v2017.03.06.00~87
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a393e1cc0e1d29c8b4c7daef6ff4c1d9bf11f78a;p=folly.git

Ensure portability/Windows.h is included before OpenSSL headers

Summary: Because OpenSSL is evil to Windows, and you have to forcefully include winsock2 before winsock.

Reviewed By: yfeldblum

Differential Revision: D4453742

fbshipit-source-id: 3b1b5b1f999722559693164148245f52b1e94104
---

diff --git a/folly/portability/OpenSSL.h b/folly/portability/OpenSSL.h
index dc6dade7..7990e137 100644
--- a/folly/portability/OpenSSL.h
+++ b/folly/portability/OpenSSL.h
@@ -16,6 +16,9 @@
 
 #pragma once
 
+// This must come before the OpenSSL includes.
+#include <folly/portability/Windows.h>
+
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
 
diff --git a/folly/ssl/detail/SSLSessionImpl.h b/folly/ssl/detail/SSLSessionImpl.h
index 6b4a9ea8..72fb8200 100644
--- a/folly/ssl/detail/SSLSessionImpl.h
+++ b/folly/ssl/detail/SSLSessionImpl.h
@@ -17,7 +17,9 @@
 #pragma once
 
 #include <folly/Range.h>
-#include <openssl/ssl.h>
+
+#include <folly/portability/OpenSSL.h>
+
 #include <string>
 
 namespace folly {