| commit | 2f431a8d5a1c2029af470a7336751a555131ee51 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Wed Oct 01 17:37:06 2014 -0700 |
| committer | Stephen Hines <srhines@google.com> | Wed Oct 01 17:37:06 2014 -0700 |
| tree | 835cc484b8f7b833f7e4cedd6951e24cddf7ebfa | |
| parent | 3ea87c33a1c6e940322f5436cf0dd70a0bdadd75 [diff] [blame] |
Fix windows-specific error without messing up Makefile flags. Bug: 14416410 The proper fix for the error/warning we encountered is to move winsock2.h in front of windows.h. Change-Id: I29504ba3a184a85c6636d06c2ad900828fdb5436
diff --git a/adb/sysdeps.h b/adb/sysdeps.h index ac9415c..cc1f839 100644 --- a/adb/sysdeps.h +++ b/adb/sysdeps.h
@@ -26,8 +26,8 @@ #ifdef _WIN32 -#include <windows.h> #include <winsock2.h> +#include <windows.h> #include <ws2tcpip.h> #include <process.h> #include <fcntl.h>