| commit | f02c7972560bc512552830c8110d026136a3a87f | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Sun Nov 09 07:24:43 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sun Nov 09 07:24:43 2014 +0000 |
| tree | f1e44b04d1aacadd96d3b56734d53309adecbb55 | |
| parent | aaa920d7969d9dd4b9e7871f2758d9092095bead [diff] | |
| parent | 7e34121e390218238bb622d3e3ccd9ccfbd152dd [diff] |
Merge "Move winsock2.h in front of a potential windows.h include."
diff --git a/include/utils/FileMap.h b/include/utils/FileMap.h index dfe6d51..02cb7df 100644 --- a/include/utils/FileMap.h +++ b/include/utils/FileMap.h
@@ -25,6 +25,10 @@ #include <utils/Compat.h> #ifdef HAVE_WIN32_FILEMAP +// Ensure that we always pull in winsock2.h before windows.h +#ifdef HAVE_WINSOCK +#include <winsock2.h> +#endif #include <windows.h> #endif