diff options
author | Stephen Hines <srhines@google.com> | 2014-11-09 07:24:43 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-09 07:24:43 +0000 |
commit | f02c7972560bc512552830c8110d026136a3a87f (patch) | |
tree | f1e44b04d1aacadd96d3b56734d53309adecbb55 /include | |
parent | aaa920d7969d9dd4b9e7871f2758d9092095bead (diff) | |
parent | 7e34121e390218238bb622d3e3ccd9ccfbd152dd (diff) | |
download | core-f02c7972560bc512552830c8110d026136a3a87f.tar.gz core-f02c7972560bc512552830c8110d026136a3a87f.tar.bz2 core-f02c7972560bc512552830c8110d026136a3a87f.zip |
Merge "Move winsock2.h in front of a potential windows.h include."
Diffstat (limited to 'include')
-rw-r--r-- | include/utils/FileMap.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/utils/FileMap.h b/include/utils/FileMap.h index dfe6d513d..02cb7dfdd 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 |