ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Move winsock2.h in front of a potential windows.h include."

Browse source
This commit is contained in:
Stephen Hines 2014-11-09 07:24:43 +00:00 • committed by Gerrit Code Review
commit f02c797256
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> #include <utils/Compat.h>
#ifdef HAVE_WIN32_FILEMAP #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> #include <windows.h>
#endif #endif