diff options
| author | Stephen Hines <srhines@google.com> | 2014-11-09 09:03:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-09 09:03:31 +0000 |
| commit | 96031a9985634e9919b1000652779f3e53a705de (patch) | |
| tree | 591acb70b36fcf37e43bc9745cdfd039f37d61ed /include | |
| parent | 7c7a782cad42ec1d1f815e648c71210c74db794d (diff) | |
| parent | f02c7972560bc512552830c8110d026136a3a87f (diff) | |
| download | system_core-96031a9985634e9919b1000652779f3e53a705de.zip system_core-96031a9985634e9919b1000652779f3e53a705de.tar.gz system_core-96031a9985634e9919b1000652779f3e53a705de.tar.bz2 | |
am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include."
* commit 'f02c7972560bc512552830c8110d026136a3a87f':
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 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 |