commit 96031a9985634e9919b1000652779f3e53a705de
author Stephen Hines <srhines@google.com> Sun Nov 09 09:03:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Nov 09 09:03:31 2014 +0000
tree 591acb70b36fcf37e43bc9745cdfd039f37d61ed
parent 7c7a782cad42ec1d1f815e648c71210c74db794d
parent f02c7972560bc512552830c8110d026136a3a87f

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.

include/utils/FileMap.h

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