openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Stephen Hines 2014-11-09 09:03:31 +00:00 committed by Android Git Automerger
parent 7c7a782cad f02c797256
commit 96031a9985
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/utils/FileMap.h
View File

@ -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