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

Commit e27b4109 authored by Stephen Hines's avatar Stephen Hines Committed by android-build-merger
Browse files

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

automerge: 96031a99

* commit '96031a99':
  Move winsock2.h in front of a potential windows.h include.
parents 9f9d9e66 96031a99
Loading
Loading
Loading
Loading
+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