diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-02 20:45:21 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-02 20:45:21 -0400 |
| commit | 490804ed33a5da70ba14bc54bceea5decb62874a (patch) | |
| tree | 2e2785ee49e779b9680e38f65831465c61cf8909 | |
| parent | d542de4a76dd9e600ebcf1405efdc9d3090ad9a8 (diff) | |
| parent | e4903f8b70057e64e07ac1e6eaab42f1153df8ff (diff) | |
| download | rneovim-490804ed33a5da70ba14bc54bceea5decb62874a.tar.gz rneovim-490804ed33a5da70ba14bc54bceea5decb62874a.tar.bz2 rneovim-490804ed33a5da70ba14bc54bceea5decb62874a.zip | |
Merge pull request #4680 from equalsraf/tb-windows-winsock2
Windows: Include winsock2.h before windows.h
| -rw-r--r-- | src/nvim/os/win_defs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nvim/os/win_defs.h b/src/nvim/os/win_defs.h index 242d355f77..55894e4d12 100644 --- a/src/nvim/os/win_defs.h +++ b/src/nvim/os/win_defs.h @@ -1,6 +1,9 @@ #ifndef NVIM_OS_WIN_DEFS_H #define NVIM_OS_WIN_DEFS_H +// winsock2.h must be first to avoid incompatibilities +// with winsock.h (included by windows.h) +#include <winsock2.h> #include <windows.h> #include <sys/stat.h> #include <io.h> |