commit e27b4109ab43daf29887c2efbac04f54a9866c02
author Stephen Hines <srhines@google.com> Sun Nov 09 09:11:58 2014 +0000
committer android-build-merger <android-build-merger@google.com> Sun Nov 09 09:11:58 2014 +0000
tree dd1f00bfc37d6d566e5a00b63dc248702c455030
parent 9f9d9e668c72528bd3c0167fa4c9aa9d67a54992
parent 96031a9985634e9919b1000652779f3e53a705de

am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include."
automerge: 96031a9

* commit '96031a9985634e9919b1000652779f3e53a705de':
  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