Commit 5beef6c2 authored by Christopher Dykes's avatar Christopher Dykes Committed by Facebook Github Bot 8

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
parent 242e3da1
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <sys/time.h> #include <sys/time.h>
#else #else
// Someone decided this was a good place to define timeval..... // Someone decided this was a good place to define timeval.....
#include <WinSock2.h> #include <folly/portability/Windows.h>
struct timezone { struct timezone {
int tz_minuteswest; int tz_minuteswest;
int tz_dsttime; int tz_dsttime;
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
#include <direct.h> // nolint #include <direct.h> // nolint
#endif #endif
#include <Windows.h>
#include <WinSock2.h> #include <WinSock2.h>
#include <Windows.h>
#ifdef CAL_GREGORIAN #ifdef CAL_GREGORIAN
#undef CAL_GREGORIAN #undef CAL_GREGORIAN
......
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