diff options
| author | Stephen Hines <srhines@google.com> | 2014-11-08 19:30:05 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-11-08 19:30:05 -0800 |
| commit | 7e34121e390218238bb622d3e3ccd9ccfbd152dd (patch) | |
| tree | ab3928cac975926af5cb494cbce7f292dadfdaee /include/utils | |
| parent | 2655256570b7c1c5af6d886735835eecb99f45f2 (diff) | |
| download | system_core-7e34121e390218238bb622d3e3ccd9ccfbd152dd.zip system_core-7e34121e390218238bb622d3e3ccd9ccfbd152dd.tar.gz system_core-7e34121e390218238bb622d3e3ccd9ccfbd152dd.tar.bz2 | |
Move winsock2.h in front of a potential windows.h include.
Files that included FileMap.h (possibly transitively), before including
ByteOrder.h (which pulls in winsock2.h directly), will experience a
compiler warning/error from the latest mingw headers. This happens because
the headers require that winsock2.h come before windows.h in all cases.
The simplest (and most error-proof) fix for now is to include winsock2.h
before this use of windows.h.
Change-Id: I33069e4c9962d9820d0ea5976554f89d7ff6307c
Diffstat (limited to 'include/utils')
| -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 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 |