From 5beef6c2aac01e8fb71c4619972ec66b50e81535 Mon Sep 17 00:00:00 2001
From: Christopher Dykes <cdykes@fb.com>
Date: Thu, 4 Aug 2016 15:49:36 -0700
Subject: [PATCH] Fix compilation errors when attempting to compile Folly
 without WIN32_LEAN_AND_MEAN defined

Summary: Without `WIN32_LEAN_AND_MEAN` defined, including `Windows.h` includes a massive number of extra headers. There are situations that need things that are defined in those headers, so keep folly working even when it isn't defined.

Reviewed By: yfeldblum

Differential Revision: D3671350

fbshipit-source-id: 0de986e17cdd4be386be8a9eeb0075b4af44024d
---
 folly/portability/SysTime.h | 2 +-
 folly/portability/Windows.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/folly/portability/SysTime.h b/folly/portability/SysTime.h
index 162ff21a..a2c32e31 100755
--- a/folly/portability/SysTime.h
+++ b/folly/portability/SysTime.h
@@ -20,7 +20,7 @@
 #include <sys/time.h>
 #else
 // Someone decided this was a good place to define timeval.....
-#include <WinSock2.h>
+#include <folly/portability/Windows.h>
 struct timezone {
   int tz_minuteswest;
   int tz_dsttime;
diff --git a/folly/portability/Windows.h b/folly/portability/Windows.h
index 3b488586..70b52541 100755
--- a/folly/portability/Windows.h
+++ b/folly/portability/Windows.h
@@ -37,8 +37,8 @@
 #include <direct.h> // nolint
 #endif
 
-#include <Windows.h>
 #include <WinSock2.h>
+#include <Windows.h>
 
 #ifdef CAL_GREGORIAN
 #undef CAL_GREGORIAN
-- 
2.34.1