Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96031a99 authored by Stephen Hines's avatar Stephen Hines Committed by Android Git Automerger
Browse files

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

* commit 'f02c7972':
  Move winsock2.h in front of a potential windows.h include.
parents 7c7a782c f02c7972

include/utils/FileMap.h

+4 −0
Original line number Diff line number Diff line
@@ -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